From 0f104ccb9a06083c5f4577cd1d54bac61aed45cb Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 5 Mar 2021 13:46:50 +0100
Subject: [PATCH] Fix issue matcher to handle multi-digit versions

---
 git/hooks/forward-merge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/hooks/forward-merge b/git/hooks/forward-merge
index f5433ffa..e412c977 100755
--- a/git/hooks/forward-merge
+++ b/git/hooks/forward-merge
@@ -25,7 +25,7 @@ def find_forward_merge(message_file)
   message = File.read(message_file)
   message.each_line do |line|
     $log.debug "Checking #{line} for message"
-    match = /^(?:Fixes|Closes) gh-(\d+) in (\d\.\d\.[\dx](?:[\.\-](?:M|RC)\d)?)$/.match(line)
+    match = /^(?:Fixes|Closes) gh-(\d+) in (\d+\.\d+\.[\d+x](?:[\.\-](?:M|RC)\d)?)$/.match(line)
     if match then
       issue = match[1]
       milestone = match[2]