Subject: Re: [PATCH v2 1/2] graph: fix case that hit assert()

From: Derrick Stolee <[email-masked]>
Date: Wed, 8 Jan 2020 14:14:38 -0500

On 1/8/2020 12:34 PM, Junio C Hamano wrote:
> Junio C Hamano <[email-masked]> writes:
> 
>> "Derrick Stolee via GitGitGadget" <[email-masked]> writes:
>>
>>> From: Derrick Stolee <[email-masked]>
>>> Subject: Re: [PATCH v2 1/2] graph: fix case that hit assert()
>>>
>>> A failure was reported in "git log --graph --all" with the new
>>> graph-rendering logic. The code fails an assert() statement when
>>> collapsing multiple edges from a merge.
>>>
>>> The assert was introduced by eaf158f8 (graph API: Use horizontal
>>> lines for more compact graphs, 2009-04-21), which is quite old.
>>> This assert is trying to say that when we complete a horizontal
>>> line with a single slash, it is because we have reached our target.
>>>
>>> This assertion is hit when we have two collapsing lines from the
>>> same merge commit, as follows:
>>>
>>>     | | | | *
>>>     | |_|_|/|
>>>     |/| | |/
>>>     | | |/|
>>>     | |/| |
>>>     | * | |
>>>     * | | |
>>
>> I was sort-of expecting to see
>> ...
>> near the beginning of this commit, though.
> 
> Will do this locally before using them in rc2.

Sounds good to me. Sorry for the delay in doing it myself.

-Stolee