Revert "[win-bootstrap] Cleanup update_depot_tools.bat for lack of git-for-windows"

This reverts commit 524abbc50e.

Reason for revert: restore calling `bootstrap\win_tools.bat` on git error to fix b/394767578

Original change's description:
> [win-bootstrap] Cleanup update_depot_tools.bat for lack of git-for-windows
>
> Bug: b/360206460
> Change-Id: I1a4d9ac8a4e0f19356e22bc15a664cc838e52cd3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6205947
> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
> Commit-Queue: Anne Redulla <aredulla@google.com>

Bug: b/360206460
Change-Id: Ifdec35e6ce594688f461f132f302c5b803640409
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6238906
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Anne Redulla <aredulla@google.com>
changes/06/6238906/2
Anne Redulla 4 months ago committed by LUCI CQ
parent 912a744103
commit 6c81fd0ae3

@ -34,13 +34,16 @@ IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :EOF
echo Updating depot_tools...
:: Test git is installed by checking its version.
:: Download git for the first time if it's not present.
call git --version > nul 2>&1
if %ERRORLEVEL% NEQ 0 (
echo Git isn't installed. Please install it.
if %ERRORLEVEL% == 0 goto :GIT_UPDATE
call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"
if errorlevel 1 (
echo Error updating depot_tools, no revision tool found.
exit /b %ERRORLEVEL%
)
:GIT_UPDATE
:: Now clear errorlevel so it can be set by other programs later.
set errorlevel=
@ -62,5 +65,5 @@ if errorlevel 1 (
:: Sync CIPD and CIPD client tools.
call "%~dp0\cipd_bin_setup.bat"
:: Update python.
:: Update git and python.
call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"

Loading…
Cancel
Save