mirror of
https://github.com/git/git
synced 2024-10-30 03:13:24 +00:00
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>
This commit is contained in:
parent
4e783b41e0
commit
deb989b57d
1 changed files with 3 additions and 2 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue