sync_default_gems: patch for focal/bullseye git

ruby/ruby#9365

Author: sorah

debian/patches/Test_SyncDefaultGems-Fail-when-editor-run.patch

@@ -0,0 +1,40 @@
+From: Sorah Fukumori <[email protected]>
+Date: Wed, 27 Dec 2023 06:07:57 +0900
+Subject: Test_SyncDefaultGems: Fail when editor run
+
+When something went wrong and git launches editor, and a editor chosen
+was terminal-based, a test run unnoticeably hangs.
+
+As we intend editors not to be run with --no-edit, GIT_EDITOR should be
+defaulted to `false` so let Git command fails when it attempts to start a
+editor. This allows catching such unintentional behaviour in test suite.
+
+(Note: Prior to Git v2.32.0, git cherry-pick doesn't support --no-edit.
+https://github.com/git/git/commit/39edfd5cbc4d168db19ec1bc867d78ec7211ec39 )
+---
+ tool/test/test_sync_default_gems.rb | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tool/test/test_sync_default_gems.rb b/tool/test/test_sync_default_gems.rb
+index 3bf87b3..e64c6c6 100755
+--- a/tool/test/test_sync_default_gems.rb
++++ b/tool/test/test_sync_default_gems.rb
+@@ -175,13 +175,13 @@ module Test_SyncDefaultGems
+       result = nil
+       out = capture_process_output_to([STDOUT, STDERR]) do
+         Dir.chdir("src") do
+-          if editor
+-            editor, ENV["GIT_EDITOR"] = ENV["GIT_EDITOR"], editor
+-            edit = true
+-          end
++          orig_editor = ENV["GIT_EDITOR"]
++          ENV["GIT_EDITOR"] = editor || 'false'
++          edit = true if editor
++
+           result = SyncDefaultGems.sync_default_gems_with_commits(@target, commits, edit: edit)
+         ensure
+-          ENV["GIT_EDITOR"] = editor if edit
++          ENV["GIT_EDITOR"] = orig_editor
+         end
+       end
+       assert_equal(success, result, out)

debian/patches/series

@@ -6,3 +6,5 @@ exclude-several-tests-unstable-in-Docker.patch
 Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
 TestProcess-disable-gems-to-disable-rubygems_integration.patch
 extract-gems-sequential-Keep-using-RUNRUBY.patch
+Test_SyncDefaultGems-Fail-when-editor-run.patch
+sync_default_gems-git-2.32-ignores-no-edit-in-cherry-pick.patch

debian/patches/sync_default_gems-git-2.32-ignores-no-edit-in-cherry-pick.patch

@@ -0,0 +1,22 @@
+From: Sorah Fukumori <[email protected]>
+Date: Wed, 27 Dec 2023 06:25:02 +0900
+Subject: sync_default_gems: git <2.32 ignores --no-edit in cherry-pick
+
+https://github.com/git/git/commit/39edfd5cbc4d168db19ec1bc867d78ec7211ec39
+---
+ tool/sync_default_gems.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
+index f4774ba..8151751 100755
+--- a/tool/sync_default_gems.rb
++++ b/tool/sync_default_gems.rb
+@@ -651,7 +651,7 @@ module SyncDefaultGems
+     if picked
+       system(*%w"git commit --amend --no-edit")
+     else
+-      system(*%w"git cherry-pick --continue --no-edit")
++      system({'GIT_EDITOR' => 'true'}, *%w"git cherry-pick --continue")
+     end or return nil
+ 
+     # Amend the commit if RDoc references need to be replaced