From: Derrick Stolee <stolee@gmail.com>
To: Jan Engelhardt <jengelh@inai.de>,
git@vger.kernel.org, James Coglan <jcoglan@gmail.com>
Subject: Re: Misrendering of git 2.24 log --graph
Date: Fri, 24 Jan 2020 09:05:48 -0500 [thread overview]
Message-ID: <b64e8fb7-1dd3-439f-6ab1-1b88c52879d1@gmail.com> (raw)
In-Reply-To: <nycvar.YFH.7.76.2001232353220.26179@n3.vanv.qr>
On 1/23/2020 6:12 PM, Jan Engelhardt wrote:
> Greetings.
Hello, Jan. Thanks for sending this report.
> I have observed git 2.24 outputting a garbage graph element for a
> particular history. The issue does not appear in 2.25, but the
> underlying bug may still be in there; it is just that _this particular
> history_ does not expose it anymore due to the new, more compact tree
> rendering that 2.25 seems to be shipping.
I initially thought you were right, as 2.25 did include some new
rendering, and we've already found and fixed a regression [1] and
a style issue [2].
[1] https://lore.kernel.org/git/pull.517.git.1578408947.gitgitgadget@gmail.com/
[2] https://lore.kernel.org/git/pull.518.git.1578457675.gitgitgadget@gmail.com/
> Reproducer:
>
> $ git clone git://github.com/jengelh/git-issue-20200123 gi
I needed to use "--mirror" in my clone to create local copies
of all the remote refs.
> $ cd gi; git log --oneline --graph --all --topo-order | head -n 74
> [...]
> | | * | ba85ad93c Merge branch 'kc-8.7.x'
> | | |\ \
> | |/ / /
Interesting, since the compact graph output in 2.25 intentionally
wanted this merge to have the first edge go immediately to the left
(see my output below).
> | | | _
> | | * 79106b731 doc: update 8.7.x news
>
> See that underscore there in line 73. The connection between commit
> 610d621dd and its parent 79106b731 is not properly connected (visually).
> I think this should have been [diff notation follows]
>
> -| | | _
> +| | | /
> +| | |/
> | | * 79106b731 doc: update 8.7.x news
>
> or something along those lines (pun intended).
You are correct about the expected output here.
Here is something I noticed: this does not reproduce without a
commit-graph! That's likely because it changes the order of the
initial refs. Keep that in mind for anyone trying to repro this.
However, I see this output with 2.24.1:
| | | | * d95d49694 freebusy: add missing "else" in HrGetHumanReadableString
| | | |/
| | |/|
| | * | ba85ad93c Merge branch 'kc-8.7.x'
| | |\ \
| |/ / /
| | | _
| | * 79106b731 doc: update 8.7.x news
and this output in 2.25.0:
| | | | * d95d49694 freebusy: add missing "else" in HrGetHumanReadableString
| | | |/
| | |/|
| | * | ba85ad93c Merge branch 'kc-8.7.x'
| |/| |
| | |/
| | * 79106b731 doc: update 8.7.x news
And comparing v2.25.0 versus ds/graph-horizontal-edges has
no difference in output.
Is it possible that you are not running the version you think you are?
Thanks,
-Stolee
next prev parent reply other threads:[~2020-01-24 14:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 23:12 Misrendering of git 2.24 log --graph Jan Engelhardt
2020-01-24 14:05 ` Derrick Stolee [this message]
2020-01-24 14:06 ` Derrick Stolee
2020-01-24 16:34 ` Misrendering of git 2.25 " Jan Engelhardt
2020-01-24 18:45 ` Derrick Stolee
2020-01-24 21:26 ` SZEDER Gábor
2020-01-24 16:08 ` Misrendering of git 2.24 " Jan Engelhardt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b64e8fb7-1dd3-439f-6ab1-1b88c52879d1@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=jcoglan@gmail.com \
--cc=jengelh@inai.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).