From 50d8b20d6c496481bf1bd042e234bdd2dd557119 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 23 Jun 2023 16:01:26 +0100 Subject: [PATCH] Re-enable forward merge issues for merges into main --- git/hooks/prepare-forward-merge | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index dea35e7391d..786afcfb312 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -27,7 +27,7 @@ end def rewrite_message(message_file, fixed) current_branch = `git rev-parse --abbrev-ref HEAD`.strip if current_branch == "main" - return nil + current_branch = $main_branch end rewritten_message = "" message = File.read(message_file) @@ -68,6 +68,4 @@ end $log.debug "Searching for forward merge" fixed = get_fixed_issues() rewritten_message = rewrite_message(message_file, fixed) -unless rewritten_message.nil? - File.write(message_file, rewritten_message) -end +File.write(message_file, rewritten_message)