mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Re-enable forward merge issues for merges into main
This commit is contained in:
parent
357c67a999
commit
50d8b20d6c
@ -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 forward merge"
|
$log.debug "Searching 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
|
|
||||||
|
Loading…
Reference in New Issue
Block a user