From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Fri, 21 Nov 2025 13:36:25 GMT
Subject: Re: [BUG] Test Failure 2.52.0, t8020.16,19
Message-ID: <328687ed-7fe6-47a2-a76e-7c38932d3914@app.fastmail.com>
In-Reply-To: <014801dc5ae9$543c73c0$fcb55b40$@nexbridge.com>

On Fri, Nov 21, 2025, at 14:18, rsbecker@nexbridge.com wrote:
> On November 19, 2025 11:25 AM, Kristoffer Haugsbakk wrote:
>>On Wed, Nov 19, 2025, at 16:50, rsbecker@nexbridge.com wrote:
>>> The following two failures appeared on NonStop for the actual release. I
> did
>>> not see them in -rc0 or after (doesn't mean they didn't happen after
> rc0).
>>> To my eyes, this looks like a real issue not just on NonStop. It is 100%
>>> reproducible and is not transient. The build is with OpenSSL 3.4, but
> that
>>> should not matter.
>>>
>>> expecting success of 8020.16 'cross merge boundaries in blaming':
>>>         git checkout HEAD^0 &&
>>>         git rm -rf . &&
>>>         test_commit m1 &&
>>>         git checkout HEAD^ &&
>>>         git rm -rf . &&
>>>         test_commit m2 &&
>>>         git merge m1 &&
>>>         check_last_modified <<-\EOF
>>>         m2 m2.t
>>>         m1 m1.t
>>>         EOF
>>>[snip]
>>
>>Also reported here https://lore.kernel.org/git/4dc4c8cd-c0cc-4784-8fcf-
>>defa3a051087@mit.edu/
>
> As a packager for NonStop, my team and I are trying to determine whether
> 2.52.0
> can actually be shipped. The concern is, is this a defect in the test code
> or underlying
> git merge code, and if the latter, how big an impact. If we hold off, how
> long will it
> take for a fix (approximately). I do not know the merge code, so...

See the email from Jeff King on that thread https://lore.kernel.org/git/20251120081611.GC1283645@coredump.intra.peff.net/

By the way your email client reflows lines so aggressively that it
breaks lines in the middle of URLs.