diff options
| author |  Jeff King <peff@peff.net> | 2017-01-25 13:35:42 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-25 13:28:34 -0800 |
| commit | 94d3997ecc09f36d17b9ad4b49c4709885e300f7 (patch) | |
| tree | d6bcd4fdbb67fb4876f084adba9c7390c9aed114 | |
| parent | difftool: retire the scripted version (diff) | |
| download | tgif-94d3997ecc09f36d17b9ad4b49c4709885e300f7.tar.xz | |
difftool: hack around -Wzero-length-format warning
Building with "gcc -Wall" will complain that the format in:
warning("")
is empty. Which is true, but the warning is over-eager. We
are calling the function for its side effect of printing
"warning:", even with an empty string.
Our DEVELOPER Makefile knob disables the warning, but not
everybody uses it. Let's silence the warning in the code so
that nobody reports it or tries to "fix" it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/difftool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 42ad9e804a..b5e85ab079 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -567,7 +567,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, warning(_("both files modified: '%s' and '%s'."), wtdir.buf, rdir.buf); warning(_("working tree file has been left.")); - warning(""); + warning("%s", ""); err = 1; } else if (unlink(wtdir.buf) || copy_file(wtdir.buf, rdir.buf, st.st_mode)) |