From: "Anders Kaseorg" <andersk@mit•edu>
To: Toon Claes <toon@iotcl•com>, git@vger•kernel.org
Subject: t8020-last-modified.sh failure on s390x (Re: [PATCH v4] last-modified: implement faster algorithm)
Date: Wed, 19 Nov 2025 03:34:26 -0800 [thread overview]
Message-ID: <4dc4c8cd-c0cc-4784-8fcf-defa3a051087@mit.edu> (raw)
In-Reply-To: <20251103154726.26592-1-toon@iotcl.com>
t8020-last-modified.sh is broken on the s390x platform in v2.52.0.
Bisection implicates commit 2a04e8c293766a4976ceceb4c663dd2963e0339e
“last-modified: implement faster algorithm” [1].
$ uname -m
s390x
$ ./t8020-last-modified.sh
ok 1 - setup
ok 2 - cannot run last-modified on two trees
ok 3 - last-modified non-recursive
ok 4 - last-modified recursive
ok 5 - last-modified recursive with show-trees
ok 6 - last-modified non-recursive with show-trees
ok 7 - last-modified subdir
ok 8 - last-modified subdir recursive
ok 9 - last-modified from non-HEAD commit
ok 10 - last-modified from subdir defaults to root
ok 11 - last-modified from subdir uses relative pathspecs
ok 12 - limit last-modified traversal by count
ok 13 - limit last-modified traversal by commit
ok 14 - only last-modified files in the current tree
ok 15 - subdirectory modified via merge
not ok 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
#
ok 17 - last-modified merge for resolved conflicts
ok 18 - last-modified merge ignores content from branch
not ok 19 - last-modified merge undoes changes
#
# git checkout HEAD^0 &&
# git rm -rf . &&
# test_commit b1 file A &&
# test_commit b2 file B &&
# test_commit b3 file C &&
# test_commit b4 file D &&
# git checkout b2 &&
# test_commit b5 file2 2 &&
# git checkout b4 &&
# git merge --no-commit --no-ff b5 &&
# git checkout b2 -- file &&
# git merge --continue &&
# check_last_modified <<-\EOF
# b5 file2
# b2 file
# EOF
#
ok 20 - last-modified complains about unknown arguments
# failed 2 among 20 test(s)
1..20
$ ./t8020-last-modified.sh --verbose
[…]
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
Note: switching to 'HEAD^0'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:
git switch -c <new-branch-name>
Or undo this operation with:
git switch -
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at 08525b6 remove a
rm 'file'
[detached HEAD 53e7187] m1
Author: A U Thor <author@example•com>
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 file
create mode 100644 m1.t
Previous HEAD position was 53e7187 m1
HEAD is now at 08525b6 remove a
rm 'file'
[detached HEAD 9b81a41] m2
Author: A U Thor <author@example•com>
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 file
create mode 100644 m2.t
Merge made by the 'ort' strategy.
m1.t | 1 +
1 file changed, 1 insertion(+)
create mode 100644 m1.t
--- expect 2025-11-19 11:28:57.966106204 +0000
+++ actual 2025-11-19 11:28:58.110112543 +0000
@@ -1,2 +1,2 @@
+ac29b6e974b49803f1c6ec5a705d1bf7dbfa7d2f m1.t
m2 m2.t
-m1 m1.t
not ok 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
#
[…]
expecting success of 8020.19 'last-modified merge undoes changes':
git checkout HEAD^0 &&
git rm -rf . &&
test_commit b1 file A &&
test_commit b2 file B &&
test_commit b3 file C &&
test_commit b4 file D &&
git checkout b2 &&
test_commit b5 file2 2 &&
git checkout b4 &&
git merge --no-commit --no-ff b5 &&
git checkout b2 -- file &&
git merge --continue &&
check_last_modified <<-\EOF
b5 file2
b2 file
EOF
HEAD is now at 7b0602a Merge tag 'a4' into HEAD
rm 'file'
[detached HEAD c48d0f6] b1
Author: A U Thor <author@example•com>
1 file changed, 1 insertion(+), 1 deletion(-)
[detached HEAD ee27b37] b2
Author: A U Thor <author@example•com>
1 file changed, 1 insertion(+), 1 deletion(-)
[detached HEAD c90ce7d] b3
Author: A U Thor <author@example•com>
1 file changed, 1 insertion(+), 1 deletion(-)
[detached HEAD 317a439] b4
Author: A U Thor <author@example•com>
1 file changed, 1 insertion(+), 1 deletion(-)
Previous HEAD position was 317a439 b4
HEAD is now at ee27b37 b2
[detached HEAD 5526d49] b5
Author: A U Thor <author@example•com>
1 file changed, 1 insertion(+)
create mode 100644 file2
Previous HEAD position was 5526d49 b5
HEAD is now at 317a439 b4
Automatic merge went well; stopped before committing as requested
[detached HEAD da1857e] Merge tag 'b5' into HEAD
Author: A U Thor <author@example•com>
--- expect 2025-11-19 11:29:03.492349022 +0000
+++ actual 2025-11-19 11:29:03.648355864 +0000
@@ -1,2 +1,2 @@
-b5 file2
-b2 file
+da1857e0652b6f264c0038d684ddecddc273e506 file2
+da1857e0652b6f264c0038d684ddecddc273e506 file
not ok 19 - last-modified merge undoes changes
#
# git checkout HEAD^0 &&
# git rm -rf . &&
# test_commit b1 file A &&
# test_commit b2 file B &&
# test_commit b3 file C &&
# test_commit b4 file D &&
# git checkout b2 &&
# test_commit b5 file2 2 &&
# git checkout b4 &&
# git merge --no-commit --no-ff b5 &&
# git checkout b2 -- file &&
# git merge --continue &&
# check_last_modified <<-\EOF
# b5 file2
# b2 file
# EOF
#
Anders
[1] https://lore.kernel.org/git/20251103154726.26592-1-toon@iotcl.com/
next prev parent reply other threads:[~2025-11-19 11:34 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-16 8:39 [PATCH] last-modified: implement faster algorithm Toon Claes
2025-10-16 18:51 ` Justin Tobler
2025-10-17 10:38 ` Toon Claes
2025-10-16 20:48 ` D. Ben Knoble
2025-10-17 10:45 ` Toon Claes
2025-10-16 23:38 ` Taylor Blau
2025-10-17 6:30 ` Jeff King
2025-10-17 14:54 ` Taylor Blau
2025-10-21 8:20 ` Jeff King
2025-10-17 12:07 ` Toon Claes
2025-10-21 9:04 ` Toon Claes
2025-10-23 23:59 ` Taylor Blau
2025-10-21 13:00 ` Toon Claes
2025-10-23 23:56 ` Taylor Blau
2025-10-27 15:48 ` Toon Claes
2025-10-17 6:37 ` Jeff King
2025-10-17 10:47 ` Toon Claes
2025-10-21 12:56 ` [PATCH v2] " Toon Claes
2025-10-21 17:52 ` Junio C Hamano
2025-10-22 0:26 ` Taylor Blau
2025-10-22 0:28 ` Taylor Blau
2025-10-22 3:48 ` Junio C Hamano
2025-10-24 0:01 ` Taylor Blau
2025-10-24 0:37 ` Junio C Hamano
2025-10-27 19:22 ` Taylor Blau
2025-10-29 13:01 ` Toon Claes
2025-10-23 8:01 ` Toon Claes
2025-10-23 7:50 ` [PATCH v3] " Toon Claes
2025-10-24 0:03 ` Taylor Blau
2025-10-27 7:03 ` Toon Claes
2025-11-03 15:47 ` [PATCH v4] " Toon Claes
2025-11-03 16:44 ` Junio C Hamano
2025-11-04 15:08 ` Toon Claes
2025-11-19 11:34 ` Anders Kaseorg [this message]
2025-11-19 13:49 ` t8020-last-modified.sh failure on s390x (Re: [PATCH v4] last-modified: implement faster algorithm) Kristoffer Haugsbakk
2025-11-19 20:06 ` Anders Kaseorg
2025-11-20 8:16 ` Jeff King
2025-11-28 16:45 ` Toon Claes
2025-11-28 17:35 ` Kristoffer Haugsbakk
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=4dc4c8cd-c0cc-4784-8fcf-defa3a051087@mit.edu \
--to=andersk@mit$(echo .)edu \
--cc=git@vger$(echo .)kernel.org \
--cc=toon@iotcl$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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