mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
This commit is contained in:
parent
221e248b66
commit
c8e966002a
|
@ -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…
Reference in New Issue
Block a user