Junio C Hamano, 11.06.2009: > Markus Heidelberg <markus.heidelberg@xxxxxx> writes: > > >> [PATCH 4/6] send-email: fix threaded mails without chain-reply-to > >> [PATCH 5/6] add a test for git-send-email for threaded mails without chain-reply-to > >> [PATCH 6/6] send-email: fix a typo in a comment > >> > >> Patch 4/6 applies on top of 15da108 to fix a breakage introduced by that > >> commit. Together with the result of applying the first three patches to > >> maint, they fix --no-thread and --thread (without --chain-reply-to) cases. > >> The result can be verified by applying Patch 5/6 on top of them. > > > > Out of curiosity: why are 4/6 and 5/6 applied on different branches > > without the usual commits first "test with test_expect_fail" then "fix + > > test changed to test_expect_success"? > > Maybe I misunderstood your problem description, but my impression from it > was that 4/6 is a fix to a latent bug in 15da108 Right, ... > that later affected what ... but the bug was immediately noticable. > was done by new code that appeard somewhere between 15da108 and 'master', The other regression from 3e0c4ff appeared before 15da108, not after it. This regression was immediately noticable as well. > and the test 5/6 was about that breakage. No, 5/6 was only about the breakage in 15da108 fixed by 4/6. I noticed the regression in 3e0c4ff after it. > IOW, root cause was older than > the symptom. Since it's a bit confusing, I'll try to clarify: * 3e0c4ff (2009-03-01) broke non-threaded This sent threaded mails instead of non-threaded: $ git send-email --no-thread --no-chain-reply-to $ git send-email --no-thread --chain-reply-to * 1/6 tests this * 2/6 fixes this * 15da108 (2009-04-13) broke threaded without chain-reply This sent non-threaded mails instead of threaded: $ git send-email --thread --no-chain-reply-to This correctly sent threaded mails: $ git send-email --thread --chain-reply-to * 4/6 fixes this * 5/6 tests this * 15da108 additionally changed another behaviour (this is the side effect from the 2/6 description, which is anticipating in view of the reordered patch sequence): This now sent non-threaded mails again, which has been broken by 3e0c4ff: $ git send-email --no-thread --no-chain-reply-to This still sent threaded mails instead of non-threaded, it was still broken since 3e0c4ff: $ git send-email --no-thread --chain-reply-to HTH and I got everything explained correctly. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html