From: Linus Torvalds <torvalds@osdl.org>
Date: Tue, 7 Feb 2006 18:26:41 +0000 (-0800)
Subject: Fix "git diff a..b" breakage
X-Git-Tag: v1.2.0~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=deb989b57d01cc1ed10ec245245a0e6214a16f87;p=git.git

Fix "git diff a..b" breakage

The "--cc" implies "-p", but without the recursive part.

		Linus

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

diff --git a/diff-tree.c b/diff-tree.c
index f3280a13e..714832334 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -284,14 +284,15 @@ int main(int argc, const char **argv)
 		}
 		usage(diff_tree_usage);
 	}
-	if (diff_options.output_format == DIFF_FORMAT_PATCH)
-		diff_options.recursive = 1;
 
 	if (combine_merges) {
 		diff_options.output_format = DIFF_FORMAT_PATCH;
 		ignore_merges = 0;
 	}
 
+	if (diff_options.output_format == DIFF_FORMAT_PATCH)
+		diff_options.recursive = 1;
+
 	diff_tree_setup_paths(get_pathspec(prefix, argv));
 	diff_setup_done(&diff_options);