Browse Source

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

teor 6 years ago
parent
commit
2b5cc8a059
2 changed files with 25 additions and 0 deletions
  1. 12 0
      scripts/maint/git-merge-forward.sh
  2. 13 0
      scripts/maint/git-pull-all.sh

+ 12 - 0
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.
 # from that repository.
 ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
 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 #
 # Git Worktree to manage #
 ##########################
 ##########################

+ 13 - 0
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.
 # from that repository.
 ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
 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 #
 # Git Worktree to manage #
 ##########################
 ##########################