From: Junio C Hamano <gitster@pobox.com>
To: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net, brad@brad-smith.co.uk,
sunshine@sunshineco.com, James Coglan <jcoglan@gmail.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH v2 1/2] graph: fix case that hit assert()
Date: Wed, 08 Jan 2020 09:34:47 -0800 [thread overview]
Message-ID: <xmqqa76x3l8o.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqd0bv3pin.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Tue, 07 Jan 2020 13:50:08 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> From: Derrick Stolee <dstolee@microsoft.com>
>> 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.
Thanks.
next prev parent reply other threads:[~2020-01-08 17:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 14:55 [PATCH 0/3] Fix two bugs in graph.c Derrick Stolee via GitGitGadget
2020-01-07 14:55 ` [PATCH 1/3] graph: fix case that hit assert() Derrick Stolee via GitGitGadget
2020-01-07 15:30 ` Jeff King
2020-01-07 18:47 ` Derrick Stolee
2020-01-07 19:21 ` Junio C Hamano
2020-01-07 19:31 ` Jeff King
2020-01-07 20:21 ` Junio C Hamano
2020-01-07 14:55 ` [PATCH 2/3] graph: replace assert() with graph_assert() macro Derrick Stolee via GitGitGadget
2020-01-07 15:36 ` Jeff King
2020-01-07 15:51 ` Eric Sunshine
2020-01-07 18:45 ` Derrick Stolee
2020-01-07 14:55 ` [PATCH 3/3] t4215: add bigger graph collapse test Derrick Stolee via GitGitGadget
2020-01-07 15:39 ` Jeff King
2020-01-07 18:02 ` Junio C Hamano
2020-01-07 18:04 ` Jeff King
2020-01-07 18:44 ` Derrick Stolee
2020-01-07 17:13 ` [PATCH 0/3] Fix two bugs in graph.c Junio C Hamano
2020-01-07 21:27 ` [PATCH v2 0/2] " Derrick Stolee via GitGitGadget
2020-01-07 21:27 ` [PATCH v2 1/2] graph: fix case that hit assert() Derrick Stolee via GitGitGadget
2020-01-07 21:50 ` Junio C Hamano
2020-01-08 17:34 ` Junio C Hamano [this message]
2020-01-08 19:14 ` Derrick Stolee
2020-01-07 21:27 ` [PATCH v2 2/2] graph: fix lack of color in horizontal lines Derrick Stolee via GitGitGadget
2020-01-07 21:51 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa76x3l8o.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=brad@brad-smith.co.uk \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jcoglan@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).