Support new version scheme in forward-merge hook

Closes gh-21636
5 years ago · d995149b21
parent d08d076fd8
commit d995149b21
2 changed files with 1 additions and 2 deletions
--- a/git/hooks/commit-msg
+++ b/git/hooks/commit-msg
@ -1 +0,0 @@
-../../git/hooks/forward-merge
--- a/git/hooks/forward-merge
+++ b/git/hooks/forward-merge
@ -18,7 +18,7 @@ def find_forward_merge(message_file)
  return nil unless rev
  message = File.read(message_file)
  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
      issue = match[1]
      milestone = match[2]