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 f3280a13ee5254452da1aae93f4b6fb4a3bb8c3e..71483233481eca8b0a88bfa02beb5c1bc2396bb7 100644 (file)
--- 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);