All of lore.kernel.org
 help / color / mirror / Atom feed
From: Derrick Stolee <stolee@gmail.com>
To: Jeff King <peff@peff.net>, Bradley Smith <brad@brad-smith.co.uk>
Cc: Junio C Hamano <gitster@pobox.com>,
	James Coglan <jcoglan@gmail.com>,
	git@vger.kernel.org
Subject: Re: Assertion in git log graphing [regression in v2.25]
Date: Tue, 7 Jan 2020 08:25:59 -0500	[thread overview]
Message-ID: <5f956281-e861-f274-be43-95d99a625abb@gmail.com> (raw)
In-Reply-To: <20200107114812.GE1073219@coredump.intra.peff.net>

On 1/7/2020 6:48 AM, Jeff King wrote:
> The assertion itself is quite old, so I wondered if it was even still
> relevant. Removing it does produce a reasonable-looking graph:

As I'm digging into this case, and finding when the assertion is hit,
I see that the issue is in the line further below your coloring issue:

>   | | | | * dd068b4 Merge commit '8f076d8' into HEAD
>   | |_|_|/| 
>   |/| | |/  
>   | | |/|   
>   | |/| |   
>   | * | | 8f076d8 5

What is output is actually this, above. But the logic that includes the
assert is checking where the underscores end, and the shown underscores
actually pass the check. The issue is that it seems like it really wants
to show this:

>   | | | | * dd068b4 Merge commit '8f076d8' into HEAD
>   | |_|_|/| 
>   |/| |_|/  
>   | |/| |   
>   | * | | 8f076d8 5

Note that I dropped a line and compressed a slash into an underscore. It's
on that line that this condition is being hit.

Now, is this really the intended behavior? Maybe. Looking at the previous
tests in 54125-log-skewed-merges.sh, I don't see any where we have two
skewed merges in the same merge.

Thanks,
-Stolee

  parent reply	other threads:[~2020-01-07 13:33 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-07 11:24 Assertion in git log graphing Bradley Smith
2020-01-07 11:48 ` Assertion in git log graphing [regression in v2.25] Jeff King
2020-01-07 12:22   ` Derrick Stolee
2020-01-07 12:42     ` Derrick Stolee
2020-01-07 12:50       ` Eric Sunshine
2020-01-07 12:56         ` Derrick Stolee
2020-01-07 13:14           ` Eric Sunshine
2020-01-07 13:25   ` Derrick Stolee [this message]
2020-01-07 14:04     ` Jeff King
2020-01-07 14:22       ` Derrick Stolee
2020-01-07 14:43         ` Derrick Stolee
2020-01-07 14:57 ` Assertion in git log graphing Derrick Stolee

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=5f956281-e861-f274-be43-95d99a625abb@gmail.com \
    --to=stolee@gmail.com \
    --cc=brad@brad-smith.co.uk \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jcoglan@gmail.com \
    --cc=peff@peff.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.