Fix "git diff a..b" breakage

Linus Torvalds · Junio C Hamano · commit deb989b57d01 · 2006-02-07T13:19:50.000-08:00
The "--cc" implies "-p", but without the recursive part.

		Linus

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -284,14 +284,15 @@ int main(int argc, const char **argv)`
`284`	`284`	`}`
`285`	`285`	`usage(diff_tree_usage);`
`286`	`286`	`}`
`287`		`- if (diff_options.output_format == DIFF_FORMAT_PATCH)`
`288`		`- diff_options.recursive = 1;`
`289`	`287`
`290`	`288`	`if (combine_merges) {`
`291`	`289`	`diff_options.output_format = DIFF_FORMAT_PATCH;`
`292`	`290`	`ignore_merges = 0;`
`293`	`291`	`}`
`294`	`292`
	`293`	`+ if (diff_options.output_format == DIFF_FORMAT_PATCH)`
	`294`	`+ diff_options.recursive = 1;`
	`295`	`+`
`295`	`296`	`diff_tree_setup_paths(get_pathspec(prefix, argv));`
`296`	`297`	`diff_setup_done(&diff_options);`
`297`	`298`