Index: update_depot_tools.bat |
diff --git a/update_depot_tools.bat b/update_depot_tools.bat |
index 990ea31eea56668ce52e6d7864bd5e7df8eb3fba..d44fba63f9ed62d99e669063414782a171be0147 100644 |
--- a/update_depot_tools.bat |
+++ b/update_depot_tools.bat |
@@ -13,6 +13,8 @@ setlocal |
:: not already in the PATH environment variable. |
call "%~dp0bootstrap\win\win_tools.bat" force |
if errorlevel 1 goto :EOF |
+:: Now clear errorlevel so it can be set by other programs later. |
+set errorlevel= |
:: Shall skip automatic update? |
IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :EOF |
@@ -31,5 +33,13 @@ goto :EOF |
:GIT_UPDATE |
cd /d "%~dp0." |
+call git config remote.origin.fetch > NUL |
+if errorlevel 1 goto :GIT_SVN_UPDATE |
+call git fetch -q origin > NUL |
+call git rebase -q origin > NUL |
+goto :EOF |
+ |
+:GIT_SVN_UPDATE |
+cd /d "%~dp0." |
call git svn rebase -q -q |
goto :EOF |