From 258ae73aa412e2d547195d3ffdb78f2af600ea9f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 27 Apr 2021 11:56:10 +0100 Subject: [PATCH] Update prepare-forward-merge following master->main rename See gh-26248 --- git/hooks/prepare-forward-merge | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index f8322030b0c..163e3ed9151 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -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)