{"thread":{"id":"3261","subject":"\"git diff a..b\" broken","startedAt":"2006-02-07T18:23:22Z","lastAt":"2006-02-07T20:42:18Z","messageCount":3,"participants":["Linus Torvalds","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"15682","messageId":"Pine.LNX.4.64.0602071020120.3854@g5.osdl.org","threadId":"3261","inReplyTo":null,"subject":"\"git diff a..b\" broken","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-02-07T18:23:22Z","receivedAt":"2006-02-07T18:23:22Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\nThere's a funny breakage from the recent \"--cc\" changes.\n\nIf you do \n\n\tgit-diff-tree --cc version version2\n\nand \"version2\" is a merge, it will do something really strange. I haven't \nfigured out quite _what_ it does, but it's definitely the wrong thing.\n\nJust a heads up. I'll try to track down what the breakage is.\n\n\t\tLinus\n"},{"id":"15683","messageId":"Pine.LNX.4.64.0602071024270.3854@g5.osdl.org","threadId":"3261","inReplyTo":"Pine.LNX.4.64.0602071020120.3854@g5.osdl.org","subject":"Re: \"git diff a..b\" broken","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-02-07T18:26:41Z","receivedAt":"2006-02-07T18:26:41Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Tue, 7 Feb 2006, Linus Torvalds wrote:\n> \n> Just a heads up. I'll try to track down what the breakage is.\n\nAhh. Very simple.\n\nThe \"--cc\" implies \"-p\", but without the recursive part.\n\n\t\tLinus\n\n----\ndiff --git a/diff-tree.c b/diff-tree.c\nindex f3280a1..7148323 100644\n--- a/diff-tree.c\n+++ b/diff-tree.c\n@@ -284,14 +284,15 @@ int main(int argc, const char **argv)\n \t\t}\n \t\tusage(diff_tree_usage);\n \t}\n-\tif (diff_options.output_format == DIFF_FORMAT_PATCH)\n-\t\tdiff_options.recursive = 1;\n \n \tif (combine_merges) {\n \t\tdiff_options.output_format = DIFF_FORMAT_PATCH;\n \t\tignore_merges = 0;\n \t}\n \n+\tif (diff_options.output_format == DIFF_FORMAT_PATCH)\n+\t\tdiff_options.recursive = 1;\n+\n \tdiff_tree_setup_paths(get_pathspec(prefix, argv));\n \tdiff_setup_done(&diff_options);\n \n"},{"id":"15690","messageId":"7vfymuvr2t.fsf@assigned-by-dhcp.cox.net","threadId":"3261","inReplyTo":"Pine.LNX.4.64.0602071024270.3854@g5.osdl.org","subject":"Re: \"git diff a..b\" broken","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-07T20:42:18Z","receivedAt":"2006-02-07T20:42:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Linus Torvalds <torvalds@osdl.org> writes:\n\n> Ahh. Very simple.\n>\n> The \"--cc\" implies \"-p\", but without the recursive part.\n\nThanks.\n"}]}