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

Support new version scheme in forward-merge hook 

Closes gh-21636
This commit is contained in:
Andy Wilkinson 2020-06-01 13:08:41 +01:00
parent d08d076fd8
commit d995149b21
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git/hooks/commit-msg
View File

@ -1 +0,0 @@
../../git/hooks/forward-merge

2
git/hooks/forward-merge
View File

@ -18,7 +18,7 @@ def find_forward_merge(message_file)
return nil unless rev return nil unless rev
message = File.read(message_file) message = File.read(message_file)
message.each_line do |line| message.each_line do |line|
match = /^(?:Fixes|Closes) gh-(\d+) in ([\d\.]+(?:(?:M|RC)\d)?)$/.match(line) match = /^(?:Fixes|Closes) gh-(\d+) in (\d\.\d\.\d(?:(?:\.|-)(?:M|RC)\d)?)$/.match(line)
if match then if match then
issue = match[1] issue = match[1]
milestone = match[2] milestone = match[2]