From: Evan Hunt <each@isc.org>
Date: Tue, 19 Mar 2013 02:34:25 +0000 (-0700)
Subject: [master] silence unnecessary output
X-Git-Tag: v9.10.0a1~448^2~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a06397b6d0f0120082e3595cec184b72f7ebaaf;p=thirdparty%2Fbind9.git

[master] silence unnecessary output
---

diff --git a/util/branchsync.sh b/util/branchsync.sh
index fd53b4ac60b..cddc70d8cab 100644
--- a/util/branchsync.sh
+++ b/util/branchsync.sh
@@ -10,6 +10,9 @@
 # commit that went cleanly, and send mail -- or, if running in interactive
 # mode, we stop and allow the user to resolve conflicts.
 #
+# NOTE: This does not push changes to the repository; currently that's up
+# to the caller.
+#
 # Usage:
 # branchsync.sh [ -i ] [ -c ]
 #   -i: interactive mode (don't reset and send mail)
@@ -71,10 +74,10 @@ if [ -z "$continuing" ]; then
     fi
 
     # make sure both branches are synced to the source repository
-    git pull origin $BRANCH
-    git checkout -f $SOURCEBRANCH
-    git pull origin $SOURCEBRANCH
-    git checkout -f $BRANCH
+    git pull origin $BRANCH > /dev/null 2>&1
+    git checkout -f $SOURCEBRANCH > /dev/null 2>&1
+    git pull origin $SOURCEBRANCH > /dev/null 2>&1
+    git checkout -f $BRANCH > /dev/null 2>&1
 fi
 
 # loop through commits looking for ones that should be cherry-picked