Skip to content

S
spring-boot
Commit c8e96600 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Fixup prepare-forward-merge for master 

Fix the regex so that merges to master are supported.
parent 221e248b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
git/hooks/prepare-forward-merge
View file @ c8e96600
...@@ -32,7 +32,7 @@ def rewrite_message(message_file, fixed) ...@@ -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? "/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment