From 86c497d8db03e431538dc0c169f41c5fb81d23d3 Mon Sep 17 00:00:00 2001 From: "szager@chromium.org" Date: Mon, 30 Sep 2013 17:32:52 +0000 Subject: [PATCH] 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 --- update_depot_tools.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/update_depot_tools.bat b/update_depot_tools.bat index 20ac0d7cd..58d3d8497 100644 --- a/update_depot_tools.bat +++ b/update_depot_tools.bat @@ -60,6 +60,8 @@ for /F %%x in ('git config --get remote.origin.url') DO ( ) call git fetch -q origin > NUL call git rebase -q origin/master > NUL +if errorlevel 1 echo Failed to update depot_tools. + goto :EOF :GIT_SVN_UPDATE