git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 5afc1d7208f8a13b7363be2127cad3b43baa95dd..81ac2fe64aea23f9db605da181da098dcfca757a 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -18,7 +18,7 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
        struct rev_info rev;
        int silent = 0;
 
-       git_config(git_diff_config);
+       git_config(git_default_config); /* no "diff" UI options */
        init_revisions(&rev);
        rev.abbrev = 0;
 
@@ -36,6 +36,9 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
                        usage(diff_files_usage);
                argv++; argc--;
        }
+       if (!rev.diffopt.output_format)
+               rev.diffopt.output_format = DIFF_FORMAT_RAW;
+
        /*
         * Make sure there are NO revision (i.e. pending object) parameter,
         * rev.max_count is reasonable (0 <= n <= 3),