Commit 8d4c15c3 authored by maruel@chromium.org's avatar maruel@chromium.org

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
parent 0dfc4ef2
...@@ -42,9 +42,10 @@ function test_git_svn { ...@@ -42,9 +42,10 @@ function test_git_svn {
# Update git checkouts prior the cygwin check, we don't want to use msysgit. # 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" ] if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
then then
# Skip this call since it fails outside a git checkout. cd $base_dir
#test_git_svn test_git_svn
(cd "$base_dir"; git svn rebase -q -q) git svn rebase -q -q
cd - > /dev/null
fi fi
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ] if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment