tor

commit 2b5cc8a059b30a47aab29d27b560ff50c741565b
parent cd52e139469bad103cd6ad02cbdf3c58bfd77b26
Author: teor <teor@torproject.org>
Date:   Wed, 13 Mar 2019 10:15:59 +1000

Merge remote-tracking branch 'tor-github/pr/783'

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 #
 ##########################