root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x

This commit is contained in:
Andy Wilkinson 2021-04-27 11:57:42 +01:00
parent ffc06e1e30 2ab679aceb
commit 4743ccc261
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ require 'net/http'
require 'yaml' require 'yaml'
require 'logger' require 'logger'
$master_branch = "2.5.x" $main_branch = "2.5.x"
$log = Logger.new(STDOUT) $log = Logger.new(STDOUT)
$log.level = Logger::WARN $log.level = Logger::WARN
@ -26,8 +26,8 @@ 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 == "master" if current_branch == "main"
current_branch = $master_branch current_branch = $main_branch
end end
rewritten_message = "" rewritten_message = ""
message = File.read(message_file) message = File.read(message_file)