Re-enable forward merge issues for merges into main

pull/36062/head
Andy Wilkinson 1 year ago
parent 357c67a999
commit 50d8b20d6c

@ -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)

Loading…
Cancel
Save