Re: [PATCH 06/11] graph: tidy up display of left-skewed merges

2019-10-14 Thread James Coglan
On 12/10/2019 02:36, Derrick Stolee wrote: > On 10/11/2019 12:50 PM, James Coglan wrote: >> On 10/10/2019 18:19, Derrick Stolee wrote: >>> On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: +++ b/t/t4215-log-skewed-merges.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +test_des

Re: [PATCH 06/11] graph: tidy up display of left-skewed merges

2019-10-11 Thread Derrick Stolee
On 10/11/2019 12:50 PM, James Coglan wrote: > On 10/10/2019 18:19, Derrick Stolee wrote: >> On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: >>> +++ b/t/t4215-log-skewed-merges.sh >>> @@ -0,0 +1,42 @@ >>> +#!/bin/sh >>> + >>> +test_description='git log --graph of skewed merges' >>> + >>

Re: [PATCH 06/11] graph: tidy up display of left-skewed merges

2019-10-11 Thread James Coglan
On 10/10/2019 18:19, Derrick Stolee wrote: > On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: >> +++ b/t/t4215-log-skewed-merges.sh >> @@ -0,0 +1,42 @@ >> +#!/bin/sh >> + >> +test_description='git log --graph of skewed merges' >> + >> +. ./test-lib.sh >> + >> +test_expect_success 'setup

Re: [PATCH 06/11] graph: tidy up display of left-skewed merges

2019-10-10 Thread Derrick Stolee
On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: > 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 veritcal pipe `|` in the GRAPH_POST_MERGE line and then

[PATCH 06/11] graph: tidy up display of left-skewed merges

2019-10-10 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 veritcal pipe `|` in the GRAPH_POST_MERGE line and then immediately enter the GRAPH_COLLAPSING state. The first-parent line tra