diff options
author | teor <teor@torproject.org> | 2020-01-15 12:28:00 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-01-15 12:28:00 +1000 |
commit | c80694deccb6f7d00cf97415a75f0c85fabd9131 (patch) | |
tree | 4d5e19956a7bf43e6d218001b221e4af674ec707 /scripts/git/git-push-all.sh | |
parent | 536eeb4589b1ce6f9cbbd36ec73cd5dd9e84ceaa (diff) | |
download | tor-c80694deccb6f7d00cf97415a75f0c85fabd9131.tar.gz tor-c80694deccb6f7d00cf97415a75f0c85fabd9131.zip |
scripts/git: Improve branch list comments
Hopefully, these explanations make it easier to get the next branch
transition right.
Part of 32772.
Diffstat (limited to 'scripts/git/git-push-all.sh')
-rwxr-xr-x | scripts/git/git-push-all.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 466b843f35..0abddc8023 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -97,9 +97,10 @@ PUSH_SAME=${TOR_PUSH_SAME:-0} # Argument processing # ####################### -# Controlled by the -t <test-branch-prefix> option. The test branch base -# name option makes git-merge-forward.sh create new test branches: -# <tbbn>_035, <tbbn>_040, ... , <tbbn>_master, and merge forward. +# Controlled by the -t <test-branch-prefix> option. The test branch prefix +# option makes git-merge-forward.sh create new test branches: +# <tbp>_035, <tbp>_040, ... , <tbp>_master, and merge each branch forward into +# the next one. TEST_BRANCH_PREFIX= while getopts ":hr:st:" opt; do @@ -200,7 +201,7 @@ PUSH_BRANCHES=$(echo \ if [ -z "$TEST_BRANCH_PREFIX" ]; then - # maint/release push mode + # maint/release push mode: push all branches. # # List of branches to push. Ordering is not important. PUSH_BRANCHES=$(echo \ @@ -212,6 +213,8 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then ) else + # Test branch push mode: push test branches, based on each maint branch. + # # List of branches to push. Ordering is not important. PUSH_BRANCHES=" \ ${TEST_BRANCH_PREFIX}_master \ |