From: Jeff King <peff@peff.net>
To: Patrick Steinhardt <ps@pks.im>
Cc: Yasushi SHOJI <yasushi.shoji@gmail.com>,
Denton Liu <liu.denton@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Segfault: git show-branch --reflog refs/pullreqs/1
Date: Wed, 21 Feb 2024 12:38:39 -0500 [thread overview]
Message-ID: <20240221173839.GC634809@coredump.intra.peff.net> (raw)
In-Reply-To: <ZdXLBIv1vLjhQUgx@tanuki>
On Wed, Feb 21, 2024 at 11:05:56AM +0100, Patrick Steinhardt wrote:
> > I am still trying to wrap my head around how it can get such wrong
> > results for show-branch when asking for "git rev-parse branch@{0}", etc,
> > are correct. I think it is that "rev-parse branch@{0}" is only looking
> > at the output oid and does not consider the reflog message at all. So I
> > think it is subtly broken, but in a way that happens to work for that
> > caller. But I'm not sure of the correct fix. At least not at this time
> > of night.
> >
> > Cc-ing folks involved in 6436a20284.
>
> Ah, our mails crossed, but we came to the same conclusion. Things indeed
> are subtly broken here and work just by chance because all callers pre
> initialize the object ID. So in the case where the reflog is missing or
> empty we'd use that pre-initialized object ID because `read_ref_at()`
> does not indicate the failure to the callers.
>
> I think that this behaviour is not sensible in the first place. When
> asking for the reflog, we should only ever return object IDs parsed from
> the reflog. Falling back to parsing the ref itself does not make much
> sense. I've thus sent a patch series that changes the behaviour here.
I left some comments on your patches. But assuming we are OK to change
the branch@{0} behavior for the empty log, the approach is sound.
That still leaves us with the bug in showing the message (which is
easily fixed), and the weird off-by-one output caused by 6436a20284.
Obviously the segfault fix can be taken independently of the rest, but I
wonder if some deeper refactoring of what 6436a20284 did will be
necessary.
-Peff
next prev parent reply other threads:[~2024-02-21 17:38 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 1:48 Segfault: git show-branch --reflog refs/pullreqs/1 Yasushi SHOJI
2024-02-21 8:42 ` Jeff King
2024-02-21 10:05 ` Patrick Steinhardt
2024-02-21 17:38 ` Jeff King [this message]
2024-02-21 17:44 ` Junio C Hamano
2024-02-22 9:02 ` Patrick Steinhardt
2024-02-22 16:32 ` Junio C Hamano
2024-02-22 17:22 ` Jeff King
2024-02-26 10:00 ` [PATCH 0/3] show-branch --reflog fixes Jeff King
2024-02-26 10:02 ` [PATCH 1/3] Revert "refs: allow @{n} to work with n-sized reflog" Jeff King
2024-02-26 10:04 ` [PATCH 2/3] get_oid_basic(): special-case ref@{n} for oldest reflog entry Jeff King
2024-02-26 15:59 ` Junio C Hamano
2024-02-26 10:08 ` [PATCH 3/3] read_ref_at(): special-case ref@{0} for an empty reflog Jeff King
2024-02-26 10:10 ` Jeff King
2024-02-26 17:25 ` Junio C Hamano
2024-02-27 8:07 ` Jeff King
2024-02-26 17:25 ` Junio C Hamano
2024-02-27 8:05 ` Jeff King
2024-02-27 17:03 ` Junio C Hamano
2024-02-21 9:52 ` Segfault: git show-branch --reflog refs/pullreqs/1 Patrick Steinhardt
2024-02-21 9:56 ` [PATCH 0/2] Detect empty or missing reflogs with `ref@{0}` Patrick Steinhardt
2024-02-21 9:56 ` [PATCH 1/2] object-name: detect and report empty reflogs Patrick Steinhardt
2024-02-21 10:37 ` Kristoffer Haugsbakk
2024-02-21 16:48 ` Eric Sunshine
2024-02-21 17:31 ` Jeff King
2024-02-21 9:56 ` [PATCH 2/2] builtin/show-branch: detect " Patrick Steinhardt
2024-02-21 17:35 ` Jeff King
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=20240221173839.GC634809@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=ps@pks.im \
--cc=yasushi.shoji@gmail.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).