Support creation of merge commits in fast-import.

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index a655eea91ed5ac38af578e47fe6747a1b6fb968c..5d4a5c5828d1202b6d6b2eadffc51fc131a37dc5 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -13,13 +13,13 @@ static const char diff_files_usage[] =
 "git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-int cmd_diff_files(int argc, const char **argv, char **envp)
+int cmd_diff_files(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
        int silent = 0;
 
-       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);
@@ -47,12 +47,5 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
        if (rev.pending.nr ||
            rev.min_age != -1 || rev.max_age != -1)
                usage(diff_files_usage);
-       /*
-        * Backward compatibility wart - "diff-files -s" used to
-        * defeat the common diff option "-s" which asked for
-        * DIFF_FORMAT_NO_OUTPUT.
-        */
-       if (rev.diffopt.output_format == DIFF_FORMAT_NO_OUTPUT)
-               rev.diffopt.output_format = DIFF_FORMAT_RAW;
        return run_diff_files(&rev, silent);
 }