tor

commit a6dd893e7687c3634f22cc0b1b706a53cc2330f5
parent 733afb52a8267d4b74e9437c71a0d8c65a9b954a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 Mar 2019 10:50:54 -0400

Fix shellcheck warnings in pull-all/merge-all scripts

This appears at first glance to be a shellcheck bug.

Closes 29747.  Bugfix not in any released Tor.

Diffstat:
M
scripts/maint/git-merge-forward.sh
 | 
12
++++++++++++
M
scripts/maint/git-pull-all.sh
 | 
13
+++++++++++++

2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/scripts/maint/git-merge-forward.sh b/scripts/maint/git-merge-forward.sh
@@ -53,6 +53,18 @@ RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4
 # 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_034[0]}
+${MAINT_035[0]}
+${MAINT_040[0]}
+${MAINT_MASTER[0]}
+${RELEASE_029[0]}
+${RELEASE_034[0]}
+${RELEASE_035[0]}
+${RELEASE_040[0]}
+EOF
+
 ##########################
 # Git Worktree to manage #
 ##########################
diff --git a/scripts/maint/git-pull-all.sh b/scripts/maint/git-pull-all.sh
@@ -52,6 +52,19 @@ RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" )
 # 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_029[0]}
+${MAINT_034[0]}
+${MAINT_035[0]}
+${MAINT_040[0]}
+${MAINT_MASTER[0]}
+${RELEASE_029[0]}
+${RELEASE_034[0]}
+${RELEASE_035[0]}
+${RELEASE_040[0]}
+EOF
+
 ##########################
 # Git Worktree to manage #
 ##########################