rebase: Support preserving merges in non-interactive mode

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index a1fa1b85cf741cd6b5f06afd02abbe618e86f5d1..04837494feba401c7f689eab5574768d3fd126de 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -5,24 +5,25 @@
 #include "builtin.h"
 
 static const char diff_cache_usage[] =
-"git-diff-index [-m] [--cached] "
+"git diff-index [-m] [--cached] "
 "[<common diff options>] <tree-ish> [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-int cmd_diff_index(int argc, const char **argv, char **envp)
+int cmd_diff_index(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
        int cached = 0;
        int i;
+       int result;
 
-       git_config(git_default_config); /* no "diff" UI options */
-       init_revisions(&rev);
+       init_revisions(&rev, prefix);
+       git_config(git_diff_basic_config, NULL); /* 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,12 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
        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 (!cached)
+               setup_work_tree();
+       if (read_cache() < 0) {
+               perror("read_cache");
+               return -1;
+       }
+       result = run_diff_index(&rev, cached);
+       return diff_result_code(&rev.diffopt, result);
 }