X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-files.c;h=81ac2fe64aea23f9db605da181da098dcfca757a;hb=5f468c4805c785115cd9c5f6a8f299f23a9034f5;hp=cebda828eec4e90f3d0af050e07a53071b39d5b7;hpb=33b292610dea9f94c986eb88f12e503f5b8375dd;p=git.git

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index cebda828e..81ac2fe64 100644
--- 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,12 +36,15 @@ 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),
 	 * there is no other revision filtering parameters.
 	 */
-	if (rev.pending_objects ||
+	if (rev.pending.nr ||
 	    rev.min_age != -1 || rev.max_age != -1)
 		usage(diff_files_usage);
 	/*