[tor-commits] [tor/master] git scripts: add maint/release-0.4.2.

[nickm at torproject.org]

commit 78f4e292192b3a5750b8801c836b512fe7b26ead
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 11 17:26:34 2019 -0400

    git scripts: add maint/release-0.4.2.
---
 scripts/git/git-merge-forward.sh | 12 +++++++++++-
 scripts/git/git-pull-all.sh      |  7 +++++++
 scripts/git/git-push-all.sh      |  5 +++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index e481b4097..d16519b3f 100755
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -98,13 +98,16 @@ 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_MASTER=( "master" "maint-0.4.1" "$GIT_PATH/$TOR_MASTER_NAME" \
+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" "_041")
 
 RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" )
 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" )
 
 # 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
@@ -117,11 +120,13 @@ ${MAINT_029_TB[0]}
 ${MAINT_035[0]}
 ${MAINT_040[0]}
 ${MAINT_041[0]}
+${MAINT_042[0]}
 ${MAINT_MASTER[0]}
 ${RELEASE_029[0]}
 ${RELEASE_035[0]}
 ${RELEASE_040[0]}
 ${RELEASE_041[0]}
+${RELEASE_042[0]}
 EOF
 
 #######################
@@ -186,6 +191,9 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then
     MAINT_041[@]
     RELEASE_041[@]
 
+    MAINT_042[@]
+    RELEASE_042[@]
+
     MAINT_MASTER[@]
   )
 
@@ -201,6 +209,8 @@ else
 
     MAINT_041[@]
 
+    MAINT_042[@]
+
     MAINT_MASTER[@]
   )
 
diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index 0d6daf432..773f97b42 100755
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -62,12 +62,14 @@ MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" )
 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_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" )
 
 RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" )
 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" )
 
 # 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
@@ -80,11 +82,13 @@ ${MAINT_029[0]}
 ${MAINT_035[0]}
 ${MAINT_040[0]}
 ${MAINT_041[0]}
+${MAINT_042[0]}
 ${MAINT_MASTER[0]}
 ${RELEASE_029[0]}
 ${RELEASE_035[0]}
 ${RELEASE_040[0]}
 ${RELEASE_041[0]}
+${RELEASE_042[0]}
 EOF
 
 ###########################
@@ -106,6 +110,9 @@ WORKTREE=(
   MAINT_041[@]
   RELEASE_041[@]
 
+  MAINT_042[@]
+  RELEASE_042[@]
+
   MAINT_MASTER[@]
 )
 COUNT=${#WORKTREE[@]}
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index a388f0156..f848da784 100755
--- a/scripts/git/git-push-all.sh
+++ b/scripts/git/git-push-all.sh
@@ -167,6 +167,7 @@ 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.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 \
@@ -176,6 +177,7 @@ fi
 
 UPSTREAM_BRANCHES=$(echo \
   "$UPSTREAM_REMOTE"/master \
+  "$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 \
@@ -188,6 +190,7 @@ UPSTREAM_BRANCHES=$(echo \
 
 PUSH_BRANCHES=$(echo \
   master \
+  {release,maint}-0.4.2 \
   {release,maint}-0.4.1 \
   {release,maint}-0.4.0 \
   {release,maint}-0.3.5 \
@@ -201,6 +204,7 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then
   # List of branches to push. Ordering is not important.
   PUSH_BRANCHES=$(echo \
     master \
+    {release,maint}-0.4.2 \
     {release,maint}-0.4.1 \
     {release,maint}-0.4.0 \
     {release,maint}-0.3.5 \
@@ -213,6 +217,7 @@ else
   # List of branches to push. Ordering is not important.
   PUSH_BRANCHES=" \
     ${TEST_BRANCH_PREFIX}_master \
+    ${TEST_BRANCH_PREFIX}_042 \
     ${TEST_BRANCH_PREFIX}_041 \
     ${TEST_BRANCH_PREFIX}_040 \
     ${TEST_BRANCH_PREFIX}_035 \