From 65fa6ef372450fb0330acf7441c31eda0bf2ef1a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 18 Oct 2024 17:06:16 +0100 Subject: [PATCH] Ignore hotfix releases when creating forward merge issue --- 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 14872f47274..03d83cbf8aa 100755 --- a/git/hooks/forward-merge +++ b/git/hooks/forward-merge @@ -65,7 +65,7 @@ def find_milestone(username, password, repository, title) prefix = title.delete_suffix('.x') $log.debug "Finding nearest milestone from candidates starting with #{prefix}" titles = milestones.map { |milestone| milestone['title'] } - titles = titles.select{ |title| title.start_with?(prefix) unless title.end_with?('.x')} + titles = titles.select{ |title| title.start_with?(prefix) unless title.end_with?('.x') || (title.count('.') > 2)} titles = titles.sort_by { |v| Gem::Version.new(v) } $log.debug "Considering candidates #{titles}" if(titles.empty?)