nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-23 20:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripts/git: Fix git-merge-forward after removing 0.2.9

Browse Source 
We need a test branch for the earliest maint branch (maint-0.3.5),
but we can't merge forward into it, because there is no previous
active maint branch.

Also, edit a git-push-all comment that still said "029".

Bugfix on 32772; bug not in any released version of tor.
This commit is contained in:
teor 2020-01-15 12:22:38 +10:00
parent b958529dbf
commit 536eeb4589
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/git/git-merge-forward.sh
View File

@ -89,9 +89,9 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
# Only used in test branch mode
# There is no previous branch to merge forward, so the second and fifth items
# must be blank ("")
MAINT_035_TB=( "maint-0.3.5" "" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" \
"_035" "")
# Used in maint/release merge and test branch modes
MAINT_035=( "maint-0.3.5" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" \
"_035" "_029")
MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" \
"_040" "_035")
MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \
@ -113,7 +113,7 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
# SC2034 -- shellcheck thinks that these are unused. We know better.
ACTUALLY_THESE_ARE_USED=<<EOF
${MAINT_035[0]}
${MAINT_035_TB[0]}
${MAINT_040[0]}
${MAINT_041[0]}
${MAINT_042[0]}
@ -175,7 +175,8 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then
# List of all worktrees to work on. All defined above. Ordering is important.
# Always the maint-* branch BEFORE then the release-*.
WORKTREE=(
MAINT_035[@]
# We don't merge forward into MAINT_035_TB[@], because it's the earliest
# maint branch
RELEASE_035[@]
MAINT_040[@]
@ -194,7 +195,8 @@ else
# Test branch mode: merge to maint only
WORKTREE=(
MAINT_035[@]
# We want a test branch based on the earliest maint branch
MAINT_035_TB[@]
MAINT_040[@]

2
scripts/git/git-push-all.sh
View File

@ -99,7 +99,7 @@ PUSH_SAME=${TOR_PUSH_SAME:-0}
# Controlled by the -t <test-branch-prefix> option. The test branch base
# name option makes git-merge-forward.sh create new test branches:
# <tbbn>_029, <tbbn>_035, ... , <tbbn>_master, and merge forward.
# <tbbn>_035, <tbbn>_040, ... , <tbbn>_master, and merge forward.
TEST_BRANCH_PREFIX=
while getopts ":hr:st:" opt; do