Update prepare-forward-merge following master->main rename

See gh-26248
pull/26253/head
Andy Wilkinson 4 years ago
parent 091907f762
commit 258ae73aa4

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

Loading…
Cancel
Save