From e42a1939f1f9f55ebe7ab3c17d67027e36aed233 Mon Sep 17 00:00:00 2001
From: "nasser@codeaurora.org"
 <nasser@codeaurora.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 1 Feb 2010 16:14:28 +0000
Subject: [PATCH] Fix for git-svn rebase bug

git-svn rebase will always output 'Current branch <> is up-to-date' when the
branch is up-to-date, even if you pass the --quiet flag(s). This change
specifically squelches that message.

Review URL: http://codereview.chromium.org/555183

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37696 0039d316-1c4b-4281-b951-d872f2087c98
---
 gclient | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gclient b/gclient
index 654d2faa5..a4efb3ca1 100755
--- a/gclient
+++ b/gclient
@@ -44,7 +44,11 @@ if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
 then
   cd $base_dir
   test_git_svn
-  git svn rebase -q -q
+  # work around a git-svn --quiet bug
+  OUTPUT=`git svn rebase -q -q`
+  if [[ ! "$OUTPUT" =~ Current.branch ]]; then
+    echo $OUTPUT
+  fi
   cd - > /dev/null
 fi