diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-02-11 10:52:49 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-02-11 10:52:49 -0500 |
| commit | 2a524662c3f8a44acd273fd0e60e161cb9a2ed0f (patch) | |
| tree | 264930aad6ff3895d645d05ac3d4582985782687 /scripts/git/git-push-all.sh | |
| parent | 80c5c874cc3cf1738bf3c84494a0996b2d4fe25e (diff) | |
| parent | 7404b6fb716424a7f63aa65be7ae0892a735251e (diff) | |
| download | tor-2a524662c3f8a44acd273fd0e60e161cb9a2ed0f.tar.gz tor-2a524662c3f8a44acd273fd0e60e161cb9a2ed0f.zip | |
Merge branch 'tor-github/pr/1717'
Diffstat (limited to 'scripts/git/git-push-all.sh')
| -rwxr-xr-x | scripts/git/git-push-all.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 0abddc8023..cb7bb5269b 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -172,18 +172,18 @@ DEFAULT_UPSTREAM_BRANCHES= if [ "$DEFAULT_UPSTREAM_REMOTE" != "$UPSTREAM_REMOTE" ]; then DEFAULT_UPSTREAM_BRANCHES=$(echo \ "$DEFAULT_UPSTREAM_REMOTE"/master \ + "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.3 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.2 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ - "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ ) fi UPSTREAM_BRANCHES=$(echo \ "$UPSTREAM_REMOTE"/master \ + "$UPSTREAM_REMOTE"/{release,maint}-0.4.3 \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.2 \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ - "$UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ "$UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ ) @@ -193,9 +193,9 @@ UPSTREAM_BRANCHES=$(echo \ PUSH_BRANCHES=$(echo \ master \ + {release,maint}-0.4.3 \ {release,maint}-0.4.2 \ {release,maint}-0.4.1 \ - {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ ) @@ -206,9 +206,9 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then # List of branches to push. Ordering is not important. PUSH_BRANCHES=$(echo \ master \ + {release,maint}-0.4.3 \ {release,maint}-0.4.2 \ {release,maint}-0.4.1 \ - {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ ) else @@ -218,9 +218,9 @@ else # List of branches to push. Ordering is not important. PUSH_BRANCHES=" \ ${TEST_BRANCH_PREFIX}_master \ + ${TEST_BRANCH_PREFIX}_043 \ ${TEST_BRANCH_PREFIX}_042 \ ${TEST_BRANCH_PREFIX}_041 \ - ${TEST_BRANCH_PREFIX}_040 \ ${TEST_BRANCH_PREFIX}_035 \ " fi |