From: Junio C Hamano <junkio@cox.net>
Date: Sun, 2 Jul 2006 05:15:40 +0000 (-0700)
Subject: builtin-diff: turn recursive on when defaulting to --patch format.
X-Git-Tag: v1.4.2-rc1~85^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=047fbe906b375e8a3a7564ad0e4443f62dd528a2;p=git.git

builtin-diff: turn recursive on when defaulting to --patch format.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-diff.c b/builtin-diff.c
index 47e0a37e2..d520c7ca2 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -254,8 +254,10 @@ int cmd_diff(int argc, const char **argv, char **envp)
 	init_revisions(&rev);
 
 	argc = setup_revisions(argc, argv, &rev, NULL);
-	if (!rev.diffopt.output_format)
+	if (!rev.diffopt.output_format) {
 		rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+		diff_setup_done(&rev.diffopt);
+	}
 
 	/* Do we have --cached and not have a pending object, then
 	 * default to HEAD by hand.  Eek.