From: teor <teor@torproject.org>
Date: Thu, 7 Nov 2019 02:04:22 +0000 (+1000)
Subject: scripts/git: Remove extra printfs from a bad merge
X-Git-Tag: tor-0.4.3.1-alpha~178
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3864536b7c19ad628df4b2f4d492ef4adc0f536c;p=thirdparty%2Ftor.git

scripts/git: Remove extra printfs from a bad merge
---

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