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

Don't create forward port issues for merges into main

Browse Source
This commit is contained in:
Andy Wilkinson 2021-11-30 15:14:33 +00:00
parent c6f74bf1fb
commit 4e884b27f8
1 changed files with 4 additions and 2 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) def rewrite_message(message_file, fixed)
current_branch = `git rev-parse --abbrev-ref HEAD`.strip current_branch = `git rev-parse --abbrev-ref HEAD`.strip
if current_branch == "main" if current_branch == "main"
current_branch = $main_branch return nil
end end
rewritten_message = "" rewritten_message = ""
message = File.read(message_file) message = File.read(message_file)
@ -68,4 +68,6 @@ end
$log.debug "Searching for for forward merge" $log.debug "Searching for for forward merge"
fixed = get_fixed_issues() fixed = get_fixed_issues()
rewritten_message = rewrite_message(message_file, fixed) rewritten_message = rewrite_message(message_file, fixed)
File.write(message_file, rewritten_message) unless rewritten_message.nil?
File.write(message_file, rewritten_message)
end