X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff.c;h=47e0a37e212d9a7085714d1b5d6d8f2ffda8d5a6;hb=f252281102514d8d3cc15a3df5ae633619c93835;hp=91235a118a3878c0d0445a741ce3182c11cdf705;hpb=a610786f4bc282410d348aba97316115a57740a0;p=git.git

diff --git a/builtin-diff.c b/builtin-diff.c
index 91235a118..47e0a37e2 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -252,9 +252,11 @@ int cmd_diff(int argc, const char **argv, char **envp)
 
 	git_config(git_diff_config);
 	init_revisions(&rev);
-	rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 
 	argc = setup_revisions(argc, argv, &rev, NULL);
+	if (!rev.diffopt.output_format)
+		rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+
 	/* Do we have --cached and not have a pending object, then
 	 * default to HEAD by hand.  Eek.
 	 */