root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup prepare-forward-merge for master 

Fix the regex so that merges to master are supported.
This commit is contained in:
Phillip Webb 2020-06-05 15:35:06 -07:00
parent 221e248b66
commit c8e966002a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/hooks/prepare-forward-merge
View File

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