mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
teor 2019-03-13 10:15:59 +10:00
commit 2b5cc8a059
No known key found for this signature in database
GPG key ID: 10FEAA0E7075672A
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/maint/git-merge-forward.sh
View file

@ -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
scripts/maint/git-pull-all.sh
View file

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