{"thread":{"id":"33439","subject":"--simplify-merges breakage","startedAt":"2013-04-08T19:00:35Z","lastAt":"2013-04-08T19:54:11Z","messageCount":2,"participants":["Kevin Bracey","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"213587","messageId":"516313D3.2050309@bracey.fi","threadId":"33439","inReplyTo":null,"subject":"--simplify-merges breakage","fromName":"Kevin Bracey","fromEmail":"kevin@bracey.fi","sentAt":"2013-04-08T19:00:35Z","receivedAt":"2013-04-08T19:00:35Z","isPatch":false,"sender":{"key":"kevin@bracey.fi","avatar":"https://avatars.githubusercontent.com/u/96079793?v=4"},"body":"Commit 4b7f53d (\"simplify-merges: drop merge from irrelevant side \nbranch\") appears to have broken simplify-merges.\n\n[Credit to \"git bisect run\" - and now I see the \"report problems \nimmediately\" message on the recent merge of that change.]\n\nI was trying to get my head around history simplification, by creating a \nrepo with the example shown in the manual.The result of \"gitk \n--simplify-merges foo\" was far from pretty.\n\nWith the example in the manual, you should get this:\n\n           .-A---M---N---O\n          /     /       /\n         I     B       D\n          \\   /       /\n           `---------'\n\nAfter 4b7f53 you instead get:\n\n           .-A---M   N---O\n         /     /   /   /\n         I     B   /   D\n          \\   /   /   /\n           `---------'\n\nKevin\n"},{"id":"213595","messageId":"7vfvz0x0gs.fsf@alter.siamese.dyndns.org","threadId":"33439","inReplyTo":"516313D3.2050309@bracey.fi","subject":"Re: --simplify-merges breakage","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-08T19:54:11Z","receivedAt":"2013-04-08T19:54:11Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kevin Bracey <kevin@bracey.fi> writes:\n\n> Commit 4b7f53d (\"simplify-merges: drop merge from irrelevant side\n> branch\") appears to have broken simplify-merges.\n>\n> ... now I see the \"report problems\n> immediately\" message on the recent merge of that change.\n\nI hope more people now see why we would like to see more people try\n'next' regularly.\n\nWill revert it for now, but that would mean side histories like gitk's\nwill keep showing up in the simplified view.\n"}]}