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

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 95a3db156bda2d1e8d2ad7bdf72a9f9a821c6f51..2b955deb912a38ccabb115f8d3a6c7feb815eb45 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -14,15 +14,16 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
        struct rev_info rev;
        int cached = 0;
        int i;
+       int result;
 
        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;
 
        argc = setup_revisions(argc, argv, &rev, NULL);
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
-                       
+
                if (!strcmp(arg, "--cached"))
                        cached = 1;
                else
@@ -38,5 +39,10 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
        if (rev.pending.nr != 1 ||
            rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
                usage(diff_cache_usage);
-       return run_diff_index(&rev, cached);
+       if (read_cache() < 0) {
+               perror("read_cache");
+               return -1;
+       }
+       result = run_diff_index(&rev, cached);
+       return diff_result_code(&rev.diffopt, result);
 }