Merge branch 'maint'

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 4abe3c28fbf98542db35c13f618b7088225740e9..e2306c162a55df30042a0bf87c9a60a1e02f5396 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -16,7 +16,7 @@ COMMON_DIFF_OPTIONS_HELP;
 int cmd_diff_files(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
-       int nongit = 0;
+       int nongit;
        int result;
 
        prefix = setup_git_directory_gently(&nongit);