threads / discuss / 33439

--simplify-merges breakage

Subject: --simplify-merges breakage

## tl;dr

2 messages between Apr 8, 2013 and Apr 8, 2013.

replies: 1people: 2as markdown or json

Kevin Bracey· Apr 8, 2013, 19:00 UTC · lore

Commit 4b7f53d ("simplify-merges: drop merge from irrelevant side branch") appears to have broken simplify-merges.

[Credit to "git bisect run" - and now I see the "report problems immediately" message on the recent merge of that change.]

I was trying to get my head around history simplification, by creating a repo with the example shown in the manual.The result of "gitk --simplify-merges foo" was far from pretty.

With the example in the manual, you should get this:

           .-A---M---N---O
          /     /       /
         I     B       D
          \   /       /
           `---------'

After 4b7f53 you instead get:

           .-A---M   N---O
         /     /   /   /
         I     B   /   D
          \   /   /   /
           `---------'

Kevin

Junio C Hamano· Apr 8, 2013, 19:54 UTC · re: Kevin Bracey · lore

Re: --simplify-merges breakage

Kevin Bracey <kevin@bracey.fi> writes:

Show 5 quoted lines

> Commit 4b7f53d ("simplify-merges: drop merge from irrelevant side
> branch") appears to have broken simplify-merges.
>
> ... now I see the "report problems
> immediately" message on the recent merge of that change.

I hope more people now see why we would like to see more people try 'next' regularly.

Will revert it for now, but that would mean side histories like gitk's will keep showing up in the simplified view.