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

Create forward port issues for merges into main

Browse Source 
This reverts commit 4e884b27f874ff210d0435fca176c75eff38b166.

Closes gh-31148
This commit is contained in:
Andy Wilkinson 2022-05-23 11:17:47 +01:00
parent 68bd9d6b6d
commit 430f033381
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) 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"
return nil current_branch = $main_branch
end end
rewritten_message = "" rewritten_message = ""
message = File.read(message_file) message = File.read(message_file)
@ -68,6 +68,4 @@ 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)
unless rewritten_message.nil? File.write(message_file, rewritten_message)
File.write(message_file, rewritten_message)
end