@matheusbsbs / matheus-bagliano / commits / deb989b57d
Fork 0

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>

Linus Torvalds committed Feb 7, 2006 at 10:26 UTC deb989b57d01cc1ed10ec245245a0e6214a16f87
1 file changed +3 -2
diff-tree.c
+3 -2
@@ -284,14 +284,15 @@ int main(int argc, const char **argv)
284 }
285 usage(diff_tree_usage);
286 }
287 - if (diff_options.output_format == DIFF_FORMAT_PATCH)
288 - diff_options.recursive = 1;
287
288 if (combine_merges) {
289 diff_options.output_format = DIFF_FORMAT_PATCH;
290 ignore_merges = 0;
291 }
292
293 + if (diff_options.output_format == DIFF_FORMAT_PATCH)
294 + diff_options.recursive = 1;
295 +
296 diff_tree_setup_paths(get_pathspec(prefix, argv));
297 diff_setup_done(&diff_options);
298