Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2087)

Unified Diff: gclient

Issue 555183: Fix for git-svn rebase bug (Closed)
Patch Set: Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient
diff --git a/gclient b/gclient
index 654d2faa50d3f949b370044388ad59dbb78e207f..a4efb3ca1347ce9fe7da35abe9c5bf83fb9651c7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698