[tor-commits] [tor/master] Fix shellcheck warnings in pull-all/merge-all scripts

[teor at torproject.org]

commit a6dd893e7687c3634f22cc0b1b706a53cc2330f5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 12 10:50:54 2019 -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.
---
 scripts/maint/git-merge-forward.sh | 12 ++++++++++++
 scripts/maint/git-pull-all.sh      | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/scripts/maint/git-merge-forward.sh b/scripts/maint/git-merge-forward.sh
index 4b294f494..67af7e98b 100755
--- 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
index 9c6a0a8f4..0a4898a11 100755
--- 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 #
 ##########################