From 167c3dbaa052d7ad34c374fc6c5f2cceab76b3ac Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@users.noreply.github.com>
Date: Wed, 19 Nov 2025 19:03:23 -0500
Subject: 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>
---
 tool/test/test_sync_default_gems.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tool/test/test_sync_default_gems.rb b/tool/test/test_sync_default_gems.rb
index cdbbb0c539..4a2688850b 100755
--- a/tool/test/test_sync_default_gems.rb
+++ b/tool/test/test_sync_default_gems.rb
@@ -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
-- 
cgit v1.2.3