[coreboot-gerrit] [XS] Change in coreboot[master]: Switch scripts over to use main branch

[Stefan Reinauer (Code Review)]

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75782?usp=email )

Change subject: Switch scripts over to use main branch
......................................................................

Switch scripts over to use main branch

This will be needed to switch over to main branch in coreboot

Change-Id: I90fadf2352d56074ce8b58d559a73b0c53fac14b
Signed-off-by: Stefan Reinauer 
---
M util/scripts/cross-repo-cherrypick
M util/scripts/update_submodules
2 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/75782/1

diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 1a174a9..3dad512 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -4,14 +4,14 @@
 # SPDX-License-Identifier: GPL-2.0-only

# Adapt to your remote branch:
-BRANCH="origin/master"
+BRANCH="origin/main"

# When pulling in patches from another tree from a gerrit repository,
 # do the following at the end of a larger cherry-pick series:
 #  git remote add ...
 #  git checkout -b upstreaming
 #  git cherry-pick ...
-#  git rebase -i --exec util/scripts/cross-repo-cherrypick master
+#  git rebase -i --exec util/scripts/cross-repo-cherrypick main
 # Alternatively, you can run util/scripts/cross-repo-cherrypick after every
 # individual cherry-pick.

@@ -24,7 +24,7 @@
 ORIGIN_HOST=$( commit_message |grep "^Reviewed-on: " |head -1 |cut -d/ -f3 )
 case "${ORIGIN_HOST}" in
    review.coreboot.org)
-		BRANCH="origin/master"
+		BRANCH="origin/main"
    	MESSAGE_PREFIX="UPSTREAM: "
    	;;
    chromium-review.googlesource.com)
diff --git a/util/scripts/update_submodules b/util/scripts/update_submodules
index 4ca2925..f966fb3 100755
--- a/util/scripts/update_submodules
+++ b/util/scripts/update_submodules
@@ -138,7 +138,7 @@
    		cd "${TOP}" || exit 1
    		git add "${submodule}" > /dev/null 2>&1 || exit 1
    		git commit -s -F- > /dev/null 2>&1 <<-EOF
-	Update ${submodule##*/} submodule to upstream master
+	Update ${submodule##*/} submodule to upstream main

Updating from commit id ${initial_commit_id}:
    $initial_commit_description