[tor-commits] [tor/master] scripts/git: Remove extra printfs from a bad merge
teor at torproject.org
teor at torproject.org
Thu Nov 7 02:07:07 UTC 2019
commit 3864536b7c19ad628df4b2f4d492ef4adc0f536c
Author: teor <teor at torproject.org>
Date: Thu Nov 7 12:04:22 2019 +1000
scripts/git: Remove extra printfs from a bad merge
---
scripts/git/git-push-all.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 7bbeaecbd..4738658f1 100755
--- a/scripts/git/git-push-all.sh
+++ b/scripts/git/git-push-all.sh
@@ -295,15 +295,10 @@ else
|| true # Skipped all maint branches
RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \
tr "\\n" " ") || true # Skipped all release branches
- printf \
- "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n%s\\n" \
- "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES"
else
# Actually test branches based on maint branches
MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) \
|| true # Skipped all maint test branches
- printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \
- "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES"
# No release branches
RELEASE_BRANCHES=
fi
More information about the tor-commits
mailing list