Browse Source

Fixup prepare-forward-merge for master

Fix the regex so that merges to master are supported.
pull/22022/head
Phillip Webb 6 years ago
parent
commit
c8e966002a
  1. 2
      git/hooks/prepare-forward-merge

2
git/hooks/prepare-forward-merge

@ -32,7 +32,7 @@ def rewrite_message(message_file, fixed) @@ -32,7 +32,7 @@ def rewrite_message(message_file, fixed)
rewritten_message = ""
message = File.read(message_file)
message.each_line do |line|
match = /^Merge.*branch\ '(.*)'(?:\ into\ (.*))$/.match(line)
match = /^Merge.*branch\ '(.*)'(?:\ into\ (.*))?$/.match(line)
if match
from_branch = match[1]
if from_branch.include? "/"

Loading…
Cancel
Save