From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jun 2019 12:56:26 +0000 (-0400)
Subject: push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
X-Git-Tag: tor-0.4.2.1-alpha~180^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbddda3a185f507314f4f4d5e1a1060f3d9bc5e5;p=thirdparty%2Ftor.git

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")
---

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 \