From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: "Denton Liu" <liu.denton@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Martin Ågren" <martin.agren@gmail.com>
Subject: Re: [PATCH v3 0/2] refs: allow @{n} to work with n-sized reflog
Date: Sun, 10 Jan 2021 12:24:21 -0800 [thread overview]
Message-ID: <xmqq4kjoa6bu.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20210110144423.GU8396@szeder.dev> ("SZEDER Gábor"'s message of "Sun, 10 Jan 2021 15:44:23 +0100")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> Junio,
>
> On Thu, Jan 07, 2021 at 02:36:57AM -0800, Denton Liu wrote:
>> When there is only one reflog entry (perhaps caused by expiring the
>> reflog and then making a single commit) @{1} errors out even though
>> there is technically enough information to do the lookup. Look at the
>> old side of the reflog instead of the new side so that this does not
>> fail. This is explained in more detail in the commit of the last patch.
>
>> Denton Liu (2):
>> refs: factor out set_read_ref_cutoffs()
>> refs: allow @{n} to work with n-sized reflog
>
> Topic 'dl/reflog-with-single-entry', i.e. these two patches queued
> directly on top of v2.29.2, break the test case "61 - valid ref of the
> form "n", n < N" in 't3903-stash.sh'. Queueing them on top of
> something already containing commit 4f44c5659b (stash: simplify reflog
> emptiness check, 2020-10-24) fixes this issue.
Thanks for carefully watching ;-)
There is no reason why this fix needs to be backported down to 2.29
track, I would think.
next prev parent reply other threads:[~2021-01-10 20:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 1:36 [PATCH] refs: allow @{n} to work with n-sized reflog Denton Liu
2021-01-02 22:30 ` Martin Ågren
2021-01-03 1:24 ` Denton Liu
2021-01-05 8:52 ` SZEDER Gábor
2021-01-06 5:55 ` Junio C Hamano
2021-01-06 8:25 ` Denton Liu
2021-01-06 21:02 ` Junio C Hamano
2021-01-06 9:01 ` [PATCH v2 0/2] " Denton Liu
2021-01-06 9:01 ` [PATCH v2 1/2] refs: factor out set_read_ref_cutoffs() Denton Liu
2021-01-06 9:01 ` [PATCH v2 2/2] refs: allow @{n} to work with n-sized reflog Denton Liu
2021-01-06 9:59 ` SZEDER Gábor
2021-01-07 10:36 ` [PATCH v3 0/2] " Denton Liu
2021-01-07 10:36 ` [PATCH v3 1/2] refs: factor out set_read_ref_cutoffs() Denton Liu
2021-01-07 10:36 ` [PATCH v3 2/2] refs: allow @{n} to work with n-sized reflog Denton Liu
2021-01-10 20:31 ` Simon Ruderich
2021-01-12 6:14 ` [PATCH v3] fixup! " Denton Liu
2021-01-12 6:18 ` Denton Liu
2021-01-12 6:27 ` Junio C Hamano
2021-01-10 14:44 ` [PATCH v3 0/2] " SZEDER Gábor
2021-01-10 20:24 ` Junio C Hamano [this message]
2021-01-07 10:43 ` [PATCH v3 3/2] fixup! " Denton Liu
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=xmqq4kjoa6bu.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=martin.agren@gmail.com \
--cc=szeder.dev@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).