Skip to content

Commit 09af101

Browse files
hsbtclaude
andcommitted
Match the updated merge commit rejection message
The message gained the refname in 77967dc but the test regex still required a period right after "prohibited". Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
1 parent 2fe75b9 commit 09af101

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎test/test-pre-receive.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_prohibit_merge_commit
9797
make_commit("mame", "mame@ruby-lang.org", "e")
9898
err = git("push") rescue $!
9999
assert_match(
100-
/A merge commit is prohibited\./,
100+
/A merge commit is prohibited for refs\/heads\/master\./,
101101
err.message
102102
)
103103
end

0 commit comments

Comments
 (0)