Merge branch '__/setup-n-mv'

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index c42ef9a7a76e7d8f6bc25d593865b9343d4e74b5..95a3db156bda2d1e8d2ad7bdf72a9f9a821c6f51 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -9,14 +9,14 @@ static const char diff_cache_usage[] =
 "[<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;
 
-       git_config(git_diff_config);
-       init_revisions(&rev);
+       init_revisions(&rev, prefix);
+       git_config(git_default_config); /* no "diff" UI options */
        rev.abbrev = 0;
 
        argc = setup_revisions(argc, argv, &rev, NULL);
@@ -28,6 +28,9 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
                else
                        usage(diff_cache_usage);
        }
+       if (!rev.diffopt.output_format)
+               rev.diffopt.output_format = DIFF_FORMAT_RAW;
+
        /*
         * Make sure there is one revision (i.e. pending object),
         * and there is no revision filtering parameters.