rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.

diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c
index 7c157ca889eaf85b38be2764fca83814bb83a3f4..5960e089975f1f27c55c5bd8ea1c968ffe695d1f 100644 (file)
--- a/builtin-diff-stages.c
+++ b/builtin-diff-stages.c
@@ -55,13 +55,12 @@ static void diff_stages(int stage1, int stage2, const char **pathspec)
        }
 }
 
-int cmd_diff_stages(int ac, const char **av, char **envp)
+int cmd_diff_stages(int ac, const char **av, const char *prefix)
 {
        int stage1, stage2;
-       const char *prefix = setup_git_directory();
        const char **pathspec = NULL;
 
-       git_config(git_diff_config);
+       git_config(git_default_config); /* no "diff" UI options */
        read_cache();
        diff_setup(&diff_options);
        while (1 < ac && av[1][0] == '-') {
@@ -85,6 +84,9 @@ int cmd_diff_stages(int ac, const char **av, char **envp)
                ac--; av++;
        }
 
+       if (!diff_options.output_format)
+               diff_options.output_format = DIFF_FORMAT_RAW;
+
        if (ac < 3 ||
            sscanf(av[1], "%d", &stage1) != 1 ||
            ! (0 <= stage1 && stage1 <= 3) ||