Re: [PATCH] t5520: don't expire reflogs where it matters

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 29, 2026, 15:02 UTC
Message-ID: <xmqqzex0hzhf.fsf@gitster.g>
In-Reply-To: <89E3CD2E-8366-4C5A-B3A4-8F44AC5F89DF@gmail.com>

Ben Knoble <ben.knoble@gmail.com> writes:

Show 7 quoted lines

>>    t5520: don't expire reflogs where it matters
>> 
>>    The t5520 failure Junio saw in 'seen' with Ben Knoble's stash series,
>>    bisected by Ben to tb/rerere-lock-grace and taken apart in the thread:
>>    https://lore.kernel.org/git/a59c4225-f093-4001-b77a-2083dfecce6e@gmail.com/
>
> Junio, if it’s simpler for you this way: I’ll just pick this patch into my series rather than wait for it to appear in seen and recreate my topic on master + it.

Either would work for me, but I created a synthetic base that includes this patch and queued your last iteration on top of it, before merging the result to 'seen' .

When you reroll, I'd reuse this synthetic base 4d7270214a (Merge branch 'tb/t5520-reflog-expire' into dk/stash-apply-index-incore, 2026-09-28)

Thanks.

Show 28 quoted lines

>> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2243%2Fthomasbachem%2Ft5520-reflog-expire-v1
>> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2243/thomasbachem/t5520-reflog-expire-v1
>> Pull-Request: https://github.com/gitgitgadget/git/pull/2243
>> 
>> t/t5520-pull.sh | 6 ++++++
>> 1 file changed, 6 insertions(+)
>> 
>> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
>> index 27f38ab3c8..bc818605a5 100755
>> --- a/t/t5520-pull.sh
>> +++ b/t/t5520-pull.sh
>> @@ -35,6 +35,12 @@ test_pull_autostash_fail () {
>> }
>> 
>> test_expect_success setup '
>> +    # Commit dates are hardcoded to 2005, and the reflog entries will have
>> +    # a matching timestamp. Maintenance may thus immediately expire
>> +    # reflogs if it was running.
>> +    git config set gc.reflogExpire never &&
>> +    git config set gc.reflogExpireUnreachable never &&
>> +
>>    echo file >file &&
>>    git add file &&
>>    git commit -a -m original
>> 
>> base-commit: 34f06850c16c7f7ac822b1adc71354f11b0f2ca3
>> --
>> gitgitgadget