diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-02-07 18:26:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-07 21:19:50 (GMT) |
| commit | deb989b57d01cc1ed10ec245245a0e6214a16f87 (patch) | |
| tree | 33e97337b9b4615b462bf2b7c56672882ee973fa | |
| parent | 4e783b41e09fb14b8ff72348ec2307fd1d5dec46 (diff) | |
| download | git-deb989b57d01cc1ed10ec245245a0e6214a16f87.zip git-deb989b57d01cc1ed10ec245245a0e6214a16f87.tar.gz git-deb989b57d01cc1ed10ec245245a0e6214a16f87.tar.bz2 | |
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>
| -rw-r--r-- | diff-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/diff-tree.c b/diff-tree.c index f3280a1..7148323 100644 --- 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); |