Merge pull request #8675 from rubygems/deivid-rodriguez/restore-original-branch-if-load-errors-happen-during-release

deivid-rodriguez · deivid-rodriguez · commit 9f42fa96aedc · 2025-05-08T21:03:49.000+02:00
Restore original branch if LoadError happens during prepare_release task (cherry picked from commit 5101b1a)
diff --git a/tool/release.rb b/tool/release.rb
@@ -206,7 +206,7 @@ def prepare!
           "Cherry-picking change logs from future RubyGems #{@rubygems.version} and Bundler #{@bundler.version} into master."
         )
       end
-    rescue StandardError
+    rescue StandardError, LoadError
       system("git", "checkout", initial_branch)
       raise
     end

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ def prepare!`
`206`	`206`	`"Cherry-picking change logs from future RubyGems #{@rubygems.version} and Bundler #{@bundler.version} into master."`
`207`	`207`	`)`
`208`	`208`	`end`
`209`		`- rescue StandardError`
	`209`	`+ rescue StandardError, LoadError`
`210`	`210`	`system("git", "checkout", initial_branch)`
`211`	`211`	`raise`
`212`	`212`	`end`