tor

commit 7ee1e16c6f9d5ddc9ceae6aac7a25291e1336426
parent 3864536b7c19ad628df4b2f4d492ef4adc0f536c
Author: teor <teor@torproject.org>
Date:   Thu,  7 Nov 2019 12:04:51 +1000

scripts/git: Stop failing when upstream branches don't exist

If you add a custom remote, or a new branch, and don't fetch first,
then the script would fail when checking for unchanged branches.

Instead, skip the check: a new branch is definitely a change.

Diffstat:
M
scripts/git/git-push-all.sh
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
@@ -251,7 +251,8 @@ if [ "$PUSH_SAME" -eq 0 ]; then
     PUSH_COMMIT=$(git rev-parse "$b")
     SKIP_UPSTREAM=
     for u in $UPSTREAM_SKIP_SAME_AS; do
-      UPSTREAM_COMMIT=$(git rev-parse "$u")
+      # Skip the branch check on error
+      UPSTREAM_COMMIT=$(git rev-parse "$u" 2>/dev/null) || continue
       if [ "$PUSH_COMMIT" = "$UPSTREAM_COMMIT" ]; then
         SKIP_UPSTREAM="$u"
       fi