kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Linus Torvalds 2006-02-07 10:26:41 -08:00 committed by Junio C Hamano
parent 4e783b41e0
commit deb989b57d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diff-tree.c
View File

@ -284,14 +284,15 @@ int main(int argc, const char **argv)
} }
usage(diff_tree_usage); usage(diff_tree_usage);
} }
if (diff_options.output_format == DIFF_FORMAT_PATCH)
diff_options.recursive = 1;


if (combine_merges) { if (combine_merges) {
diff_options.output_format = DIFF_FORMAT_PATCH; diff_options.output_format = DIFF_FORMAT_PATCH;
ignore_merges = 0; ignore_merges = 0;
} }


if (diff_options.output_format == DIFF_FORMAT_PATCH)
diff_options.recursive = 1;

diff_tree_setup_paths(get_pathspec(prefix, argv)); diff_tree_setup_paths(get_pathspec(prefix, argv));
diff_setup_done(&diff_options); diff_setup_done(&diff_options);