From 8d4c15c3baca8e4bb55ffce172c7cf77f1d408e4 Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 8 Jan 2010 20:29:06 +0000
Subject: [PATCH] Change to a git repo before checking git-svn version

TEST=none
BUG=none
R=maruel

Patch contributed by Nasser <nasser@codeaurora>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35817 0039d316-1c4b-4281-b951-d872f2087c98
---
 gclient | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gclient b/gclient
index 7efc29eba..654d2faa5 100755
--- a/gclient
+++ b/gclient
@@ -42,9 +42,10 @@ function test_git_svn {
 # Update git checkouts prior the cygwin check, we don't want to use msysgit.
 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
 then
-  # Skip this call since it fails outside a git checkout.
-  #test_git_svn
-  (cd "$base_dir"; git svn rebase -q -q)
+  cd $base_dir
+  test_git_svn
+  git svn rebase -q -q
+  cd - > /dev/null
 fi
 
 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]