Commit 2ab679ac authored by Andy Wilkinson's avatar Andy Wilkinson

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

See gh-26248
parent 715c4feb
......@@ -4,7 +4,7 @@ require 'net/http'
require 'yaml'
require 'logger'
$master_branch = "2.5.x"
$main_branch = "2.5.x"
$log = Logger.new(STDOUT)
$log.level = Logger::WARN
......@@ -26,8 +26,8 @@ end
def rewrite_message(message_file, fixed)
current_branch = `git rev-parse --abbrev-ref HEAD`.strip
if current_branch == "master"
current_branch = $master_branch
if current_branch == "main"
current_branch = $main_branch
end
rewritten_message = ""
message = File.read(message_file)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment