From: Junio C Hamano <gitster@pobox.com>
To: <rsbecker@nexbridge.com>
Cc: "'Kristoffer Haugsbakk'" <kristofferhaugsbakk@fastmail.com>,
<git@vger.kernel.org>
Subject: Re: [BUG] Test Failure 2.52.0, t8020.16,19
Date: Fri, 21 Nov 2025 08:28:19 -0800 [thread overview]
Message-ID: <xmqqy0nz4afw.fsf@gitster.g> (raw)
In-Reply-To: <014801dc5ae9$543c73c0$fcb55b40$@nexbridge.com> (rsbecker@nexbridge.com's message of "Fri, 21 Nov 2025 08:18:24 -0500")
<rsbecker@nexbridge.com> writes:
>>> 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/
>
> .... 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...
But is this really about "merge"?
The test is about how the "last-modified" command behaves given
histories of various shapes prepared with the sequence of commands
that comes before the "check_last_modified" line.
You can probably take a snapshot of the resulting repository
immediately after "git merge m1" from a test with both problematic
version and older version and compare the two repositories, and I an
reasonably certain that you wouldn't see any differences (no, I am
not saying they should be bit-for-bit identical, but the set of
objects and topology should be the same). Bisection by others
pointing at a commit that changed how "last-modified" computes its
result should be a strong enough hint as well that the problem is
unlikely with "merge".
prev parent reply other threads:[~2025-11-21 16:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-19 15:50 [BUG] Test Failure 2.52.0, t8020.16,19 rsbecker
2025-11-19 16:25 ` Kristoffer Haugsbakk
2025-11-19 16:37 ` rsbecker
2025-11-21 13:18 ` rsbecker
2025-11-21 13:36 ` Kristoffer Haugsbakk
2025-11-21 13:58 ` rsbecker
2025-11-26 16:15 ` rsbecker
2025-11-26 19:18 ` rsbecker
2025-11-21 16:28 ` Junio C Hamano [this message]
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=xmqqy0nz4afw.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=rsbecker@nexbridge.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).