From: Jeff King Date: Wed, 25 Jan 2017 18:35:42 +0000 (-0500) Subject: difftool: hack around -Wzero-length-format warning X-Git-Tag: v2.12.0-rc0~28^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94d3997ecc09f36d17b9ad4b49c4709885e300f7;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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))