pull --rebase: exit early when the working directory is dirty

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 9c0411165691bb1c3a581e9927e124e55fbd7bfd..e2306c162a55df30042a0bf87c9a60a1e02f5396 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -16,12 +16,12 @@ 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);
        init_revisions(&rev, prefix);
-       git_config(git_default_config); /* no "diff" UI options */
+       git_config(git_diff_basic_config); /* no "diff" UI options */
        rev.abbrev = 0;
 
        if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))