fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable forward merge issues for merges into main

Browse Source
This commit is contained in:
Andy Wilkinson 2023-06-23 16:01:26 +01:00
parent 357c67a999
commit 50d8b20d6c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git/hooks/prepare-forward-merge
View File

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