From 7404b6fb716424a7f63aa65be7ae0892a735251e Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Feb 2020 19:56:32 -0500
Subject: [PATCH] Update scripts/git/*.sh to know about 043 and not about 040.

---
 scripts/git/git-merge-forward.sh | 28 ++++++++++++++--------------
 scripts/git/git-pull-all.sh      | 14 +++++++-------
 scripts/git/git-push-all.sh      | 10 +++++-----
 scripts/git/git-setup-dirs.sh    | 14 +++++++-------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index bbc5047cb7..247c605436 100755
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -94,19 +94,19 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
 MAINT_035_TB=( "maint-0.3.5" "" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" \
     "_035" "")
 # Used in maint/release merge and test branch modes
-MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" \
-    "_040" "_035")
-MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \
-    "_041" "_040")
+MAINT_041=( "maint-0.4.1" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \
+    "_041" "_035")
 MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \
     "_042" "_041")
-MAINT_MASTER=( "master" "maint-0.4.2" "$GIT_PATH/$TOR_MASTER_NAME" \
-    "_master" "_042")
+MAINT_043=( "maint-0.4.3" "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" \
+    "_043" "_042")
+MAINT_MASTER=( "master" "maint-0.4.3" "$GIT_PATH/$TOR_MASTER_NAME" \
+    "_master" "_043")
 
 RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )
-RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" )
 RELEASE_041=( "release-0.4.1" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" )
 RELEASE_042=( "release-0.4.2" "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" )
+RELEASE_043=( "release-0.4.3" "maint-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
@@ -116,14 +116,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_TB[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
 
 #######################
@@ -181,15 +181,15 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then
     # maint branch
     RELEASE_035[@]
 
-    MAINT_040[@]
-    RELEASE_040[@]
-
     MAINT_041[@]
     RELEASE_041[@]
 
     MAINT_042[@]
     RELEASE_042[@]
 
+    MAINT_043[@]
+    RELEASE_043[@]
+
     MAINT_MASTER[@]
   )
 
@@ -203,12 +203,12 @@ else
     # We want a test branch based on the earliest maint branch
     MAINT_035_TB[@]
 
-    MAINT_040[@]
-
     MAINT_041[@]
 
     MAINT_042[@]
 
+    MAINT_043[@]
+
     MAINT_MASTER[@]
   )
 
diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index c8d115da01..eb3e1c8881 100755
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -59,15 +59,15 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
 # 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
@@ -77,14 +77,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
 
 ###########################
@@ -96,15 +96,15 @@ WORKTREE=(
   MAINT_035[@]
   RELEASE_035[@]
 
-  MAINT_040[@]
-  RELEASE_040[@]
-
   MAINT_041[@]
   RELEASE_041[@]
 
   MAINT_042[@]
   RELEASE_042[@]
 
+  MAINT_043[@]
+  RELEASE_043[@]
+
   MAINT_MASTER[@]
 )
 COUNT=${#WORKTREE[@]}
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 0abddc8023..cb7bb5269b 100755
--- a/scripts/git/git-push-all.sh
+++ b/scripts/git/git-push-all.sh
@@ -172,18 +172,18 @@ DEFAULT_UPSTREAM_BRANCHES=
 if [ "$DEFAULT_UPSTREAM_REMOTE" != "$UPSTREAM_REMOTE" ]; then
   DEFAULT_UPSTREAM_BRANCHES=$(echo \
     "$DEFAULT_UPSTREAM_REMOTE"/master \
+    "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.3 \
     "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.2 \
     "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.1 \
-    "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.0 \
     "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.3.5 \
     )
 fi
 
 UPSTREAM_BRANCHES=$(echo \
   "$UPSTREAM_REMOTE"/master \
+  "$UPSTREAM_REMOTE"/{release,maint}-0.4.3 \
   "$UPSTREAM_REMOTE"/{release,maint}-0.4.2 \
   "$UPSTREAM_REMOTE"/{release,maint}-0.4.1 \
-  "$UPSTREAM_REMOTE"/{release,maint}-0.4.0 \
   "$UPSTREAM_REMOTE"/{release,maint}-0.3.5 \
   )
 
@@ -193,9 +193,9 @@ UPSTREAM_BRANCHES=$(echo \
 
 PUSH_BRANCHES=$(echo \
   master \
+  {release,maint}-0.4.3 \
   {release,maint}-0.4.2 \
   {release,maint}-0.4.1 \
-  {release,maint}-0.4.0 \
   {release,maint}-0.3.5 \
   )
 
@@ -206,9 +206,9 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then
   # List of branches to push. Ordering is not important.
   PUSH_BRANCHES=$(echo \
     master \
+    {release,maint}-0.4.3 \
     {release,maint}-0.4.2 \
     {release,maint}-0.4.1 \
-    {release,maint}-0.4.0 \
     {release,maint}-0.3.5 \
     )
 else
@@ -218,9 +218,9 @@ else
   # List of branches to push. Ordering is not important.
   PUSH_BRANCHES=" \
     ${TEST_BRANCH_PREFIX}_master \
+    ${TEST_BRANCH_PREFIX}_043 \
     ${TEST_BRANCH_PREFIX}_042 \
     ${TEST_BRANCH_PREFIX}_041 \
-    ${TEST_BRANCH_PREFIX}_040 \
     ${TEST_BRANCH_PREFIX}_035 \
     "
 fi
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[@]
 )