Merge pull request #112 from ruby/claude/github-actions-error-fix-2fba53

hsbt · web-flow · commit b7e58cdd45f0 · 2026-07-30T13:17:13.000+09:00
Match the updated merge commit rejection message
diff --git a/test/test-pre-receive.rb b/test/test-pre-receive.rb
@@ -97,7 +97,7 @@ def test_prohibit_merge_commit
     make_commit("mame", "mame@ruby-lang.org", "e")
     err = git("push") rescue $!
     assert_match(
-      /A merge commit is prohibited\./,
+      /A merge commit is prohibited for refs\/heads\/master\./,
       err.message
     )
   end

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ def test_prohibit_merge_commit`
`97`	`97`	`make_commit("mame", "mame@ruby-lang.org", "e")`
`98`	`98`	`err = git("push") rescue $!`
`99`	`99`	`assert_match(`
`100`		`- /A merge commit is prohibited\./,`
	`100`	`+ /A merge commit is prohibited for refs\/heads\/master\./,`
`101`	`101`	`err.message`
`102`	`102`	`)`
`103`	`103`	`end`