From b9fc08e607028aa80f3b4b8130574001f70c4809 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 28 Nov 2021 23:42:50 +0100 Subject: [PATCH] build-and-update-all-branches: s/master/main/ take #2 --- build-and-update-all-branches | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index 43fedfb..3bf530d 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,11 +3,12 @@ # Prepare master branch, review the list of branches below and then execute this # script. -branches='rawhide epel7 epel8 f33 f34 f35' +main=rawhide +branches="$main epel7 epel8 f33 f34 f35" exit_handler () { - git checkout master + git checkout "$main" } trap exit_handler EXIT @@ -19,9 +20,9 @@ koji hello tasks= for branch in $branches; do - if test $branch != master; then + if test $branch != "$main"; then git checkout "$branch" - git merge master + git merge "$main" fi git push tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`"