diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-10 19:56:32 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-02-11 10:52:42 -0500 |
| commit | 7404b6fb716424a7f63aa65be7ae0892a735251e (patch) | |
| tree | 22c0c4d5a857994f163a378d03a9e470e608da3a /scripts/git/git-setup-dirs.sh | |
| parent | 71d96cefc0314bc3ad6cad867586c492a287c6c9 (diff) | |
| download | tor-7404b6fb716424a7f63aa65be7ae0892a735251e.tar.gz tor-7404b6fb716424a7f63aa65be7ae0892a735251e.zip | |
Update scripts/git/*.sh to know about 043 and not about 040.
Diffstat (limited to 'scripts/git/git-setup-dirs.sh')
| -rwxr-xr-x | scripts/git/git-setup-dirs.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index 20a148204a..2d16cc1d66 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -97,15 +97,15 @@ GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No_Pushing_To_GitHub"} # 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_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) 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_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) 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" ) # 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 @@ -115,14 +115,14 @@ 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_040[0]} ${MAINT_041[0]} ${MAINT_042[0]} +${MAINT_043[0]} ${MAINT_MASTER[0]} ${RELEASE_035[0]} -${RELEASE_040[0]} ${RELEASE_041[0]} ${RELEASE_042[0]} +${RELEASE_043[0]} EOF ####################### @@ -165,15 +165,15 @@ WORKTREE=( MAINT_035[@] RELEASE_035[@] - MAINT_040[@] - RELEASE_040[@] - MAINT_041[@] RELEASE_041[@] MAINT_042[@] RELEASE_042[@] + MAINT_043[@] + RELEASE_043[@] + MAINT_MASTER[@] ) |