aboutsummaryrefslogtreecommitdiff
path: root/scripts/git
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-07 12:04:22 +1000
committerteor <teor@torproject.org>2019-11-07 12:04:22 +1000
commit3864536b7c19ad628df4b2f4d492ef4adc0f536c (patch)
tree5b73fbd3a47c20fd0d209dc7f0cd60724a71538e /scripts/git
parent57f43bcb03b6dafd3564b128f40e4d6713c91b8e (diff)
downloadtor-3864536b7c19ad628df4b2f4d492ef4adc0f536c.tar.gz
tor-3864536b7c19ad628df4b2f4d492ef4adc0f536c.zip
scripts/git: Remove extra printfs from a bad merge
Diffstat (limited to 'scripts/git')
-rwxr-xr-xscripts/git/git-push-all.sh5
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 7bbeaecbd0..4738658f1d 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