Commit 86c497d8 authored by szager@chromium.org's avatar szager@chromium.org

Indicate when depot_tools can't be updated on Windows.

When depot_tools fail to update right now all you get is
    Cannot rebase: You have unstaged changes.
    Please commit or stash them.
As that is typically in a call to gclient it's far from obvious what
could not be updated so add a line saying
    Failed to update depot_tools.
to that. Linux and Mac already have a similar error message in their
script file.

BUG=
R=szager@chromium.org

Review URL: https://codereview.chromium.org/23619058

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@226002 0039d316-1c4b-4281-b951-d872f2087c98
parent 99918abb
...@@ -60,6 +60,8 @@ for /F %%x in ('git config --get remote.origin.url') DO ( ...@@ -60,6 +60,8 @@ for /F %%x in ('git config --get remote.origin.url') DO (
) )
call git fetch -q origin > NUL call git fetch -q origin > NUL
call git rebase -q origin/master > NUL call git rebase -q origin/master > NUL
if errorlevel 1 echo Failed to update depot_tools.
goto :EOF goto :EOF
:GIT_SVN_UPDATE :GIT_SVN_UPDATE
......
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