torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update git scripts to use git-list-tor-branches.sh

Browse Source
This commit is contained in:
Nick Mathewson
2020-02-11 12:17:03 -05:00
committed by David Goulet
parent 42660ea056
commit d9152b8a66
4 changed files with 28 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/git/git-pull-all.sh
+4 -55
View File
@@ -2,7 +2,7 @@
SCRIPT_NAME=$(basename "$0")
function usage()
usage()
{
echo "$SCRIPT_NAME [-h] [-n]"
echo
@@ -47,66 +47,15 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
# Git branches to manage #
##########################
# Configuration of the branches that need pulling. The values are in order:
# (1) Branch name to pull (update).
# (2) Full path of the git worktree.
#
# As an example:
# $ cd <PATH/TO/WORKTREE> (3)
# $ git checkout maint-0.3.5 (1)
# $ git pull
#
# First set of arrays are the maint-* branch and then the release-* branch.
# New arrays need to be in the WORKTREE= array else they aren't considered.
MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" )
MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" )
MAINT_043=( "maint-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" )
MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" )
RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )
RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" )
RELEASE_042=( "release-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" )
RELEASE_043=( "release-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.3" )
set -e
eval "$(git-list-tor-branches.sh -b)"
set +e
# The master branch path has to be the main repository thus contains the
# origin that will be used to fetch the updates. All the worktrees are created
# from that repository.
ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
# SC2034 -- shellcheck thinks that these are unused. We know better.
ACTUALLY_THESE_ARE_USED=<<EOF
${MAINT_035[0]}
${MAINT_041[0]}
${MAINT_042[0]}
${MAINT_043[0]}
${MAINT_MASTER[0]}
${RELEASE_035[0]}
${RELEASE_041[0]}
${RELEASE_042[0]}
${RELEASE_043[0]}
EOF
###########################
# Git worktrees to manage #
###########################
# List of all worktrees to pull. All defined above. Ordering is not important.
WORKTREE=(
MAINT_035[@]
RELEASE_035[@]
MAINT_041[@]
RELEASE_041[@]
MAINT_042[@]
RELEASE_042[@]
MAINT_043[@]
RELEASE_043[@]
MAINT_MASTER[@]
)
COUNT=${#WORKTREE[@]}
#######################