Re: [PATCH v3 08/13] graph: tidy up display of left-skewed merges

2019-10-17 Thread Junio C Hamano
Derrick Stolee writes: > I hit this very situation recently when I was experimenting with > 'git fast-import' and accidentally created many parallel, independent > histories. Running "git log --graph --all --simplify-by-decoration" > made it look like all the refs were in a line, but they were no

Re: [PATCH v3 08/13] graph: tidy up display of left-skewed merges

2019-10-17 Thread Derrick Stolee
On 10/16/2019 12:00 AM, Junio C Hamano wrote: > "James Coglan via GitGitGadget" writes: > >> This effect is applied to both "normal" two-parent merges, and to >> octopus merges. It also reduces the vertical space needed for pre-commit >> lines, as the merge occupies one less column than usual. >>

Re: [PATCH v3 08/13] graph: tidy up display of left-skewed merges

2019-10-15 Thread Junio C Hamano
"James Coglan via GitGitGadget" writes: > This effect is applied to both "normal" two-parent merges, and to > octopus merges. It also reduces the vertical space needed for pre-commit > lines, as the merge occupies one less column than usual. > > Before: After: > > | *

[PATCH v3 08/13] graph: tidy up display of left-skewed merges

2019-10-15 Thread James Coglan via GitGitGadget
From: James Coglan Currently, when we display a merge whose first parent is already present in a column to the left of the merge commit, we display the first parent as a vertical pipe `|` in the GRAPH_POST_MERGE line and then immediately enter the GRAPH_COLLAPSING state. The first-parent line tra