* "git diff a..b" broken
@ 2006-02-07 18:23 Linus Torvalds
2006-02-07 18:26 ` Linus Torvalds
0 siblings, 1 reply; 3+ messages in thread
From: Linus Torvalds @ 2006-02-07 18:23 UTC (permalink / raw)
To: Junio C Hamano, Git Mailing List
There's a funny breakage from the recent "--cc" changes.
If you do
git-diff-tree --cc version version2
and "version2" is a merge, it will do something really strange. I haven't
figured out quite _what_ it does, but it's definitely the wrong thing.
Just a heads up. I'll try to track down what the breakage is.
Linus
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: "git diff a..b" broken
2006-02-07 18:23 "git diff a..b" broken Linus Torvalds
@ 2006-02-07 18:26 ` Linus Torvalds
2006-02-07 20:42 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Linus Torvalds @ 2006-02-07 18:26 UTC (permalink / raw)
To: Junio C Hamano, Git Mailing List
On Tue, 7 Feb 2006, Linus Torvalds wrote:
>
> Just a heads up. I'll try to track down what the breakage is.
Ahh. Very simple.
The "--cc" implies "-p", but without the recursive part.
Linus
----
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);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: "git diff a..b" broken
2006-02-07 18:26 ` Linus Torvalds
@ 2006-02-07 20:42 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2006-02-07 20:42 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List
Linus Torvalds <torvalds@osdl.org> writes:
> Ahh. Very simple.
>
> The "--cc" implies "-p", but without the recursive part.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-02-07 20:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-02-07 18:23 "git diff a..b" broken Linus Torvalds
2006-02-07 18:26 ` Linus Torvalds
2006-02-07 20:42 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).