[tor-commits] [tor/master] push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH

[asn at torproject.org]

commit bbddda3a185f507314f4f4d5e1a1060f3d9bc5e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 10 08:56:26 2019 -0400

    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")
---
 scripts/git/git-push-all.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 9e1b39c10..0701b27b5 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 \