From d995149b21f15e4ea87c1fc3d430f844ff8202cf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 1 Jun 2020 13:08:41 +0100 Subject: [PATCH] Support new version scheme in forward-merge hook Closes gh-21636 --- git/hooks/commit-msg | 1 - git/hooks/forward-merge | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 git/hooks/commit-msg diff --git a/git/hooks/commit-msg b/git/hooks/commit-msg deleted file mode 120000 index dee7d3fc93f..00000000000 --- a/git/hooks/commit-msg +++ /dev/null @@ -1 +0,0 @@ -../../git/hooks/forward-merge \ No newline at end of file diff --git a/git/hooks/forward-merge b/git/hooks/forward-merge index 2d0a3b199b6..64cc108e568 100755 --- 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]