diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-10 08:56:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-10 09:01:17 -0400 |
| commit | bbddda3a185f507314f4f4d5e1a1060f3d9bc5e5 (patch) | |
| tree | 810b8890cb0f8ddffd12300cf093559ccdde88db | |
| parent | 46da530431d340cde22192d9df475d85b5d9fab7 (diff) | |
| download | tor-bbddda3a185f507314f4f4d5e1a1060f3d9bc5e5.tar.gz tor-bbddda3a185f507314f4f4d5e1a1060f3d9bc5e5.zip | |
push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
We already allow this override in our pre-push hook, so let's allow
it here too.
(I call my upstream branches "origin")
| -rwxr-xr-x | scripts/git/git-push-all.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 9e1b39c10a..0701b27b59 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,9 +1,9 @@ #!/bin/bash # The remote upstream branch on which git.torproject.org/tor.git points to. -UPSTREAM_BRANCH="upstream" +UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} -git push $UPSTREAM_BRANCH \ +git push "$UPSTREAM_BRANCH" \ master \ {release,maint}-0.4.1 \ {release,maint}-0.4.0 \ |