Omit a test on s390x linux tripping over a git bug

This test has been reliably failing on recent trunk versions.

See: <https://github.com/ruby/ruby/actions/runs/19519712433/job/55880266450#step:14:120>
This commit is contained in:
Alan Wu authored and GitHub committed 2025-11-20 00:03:23 +00:00
1 parent f5f69d4114
commit 167c3dbaa0
1 file changed
+3
Notes: git 2026-03-27 22:34:23 +00:00
Merged: https://github.com/ruby/ruby/pull/15252

Merged-By: XrXr
+3
View File
@@ -319,6 +319,9 @@ module Test_SyncDefaultGems
end
def test_squash_merge
if RUBY_PLATFORM =~ /s390x/
omit("git 2.43.0 bug on s390x ubuntu 24.04: BUG: log-tree.c:1058: did a remerge diff without remerge_objdir?!?")
end
# 2---. <- branch
# / \
# 1---3---3'<- merge commit with conflict resolution