From d9f405d4daacd4e8e8c5701538819b5aa68a5292 Mon Sep 17 00:00:00 2001 From: "szager@chromium.org" Date: Thu, 27 Mar 2014 22:07:15 +0000 Subject: [PATCH] Re-enable git-1.9.0 There is now a separate XP-compatible release which doesn't have the performance fix for index-pack. BUG= NOTRY=true R=mmoss@google.com Review URL: https://codereview.chromium.org/215133002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260010 0039d316-1c4b-4281-b951-d872f2087c98 --- bootstrap/win/win_tools.bat | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat index 8861c90e5..43f38a47b 100644 --- a/bootstrap/win/win_tools.bat +++ b/bootstrap/win/win_tools.bat @@ -60,12 +60,20 @@ goto :END :GIT_CHECK -goto :GIT_1852_CHECK +goto :GIT_190_CHECK :GIT_190_CHECK if "%DEPOT_TOOLS_GIT_190%" == "0" goto :GIT_1852_CHECK -set GIT_VERSION=1.9.0.chromium.1 +:: Clean up a couple of known broken releases +for /l %%i in (1,1,2) do if exist "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" ( + rmdir /s /q "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" +) +set GIT_VERSION=1.9.0.chromium.3 +for /f "tokens=2 delims=[]" %%i in ('ver') do set VERSTR=%%i +for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set VERMINOR=%%j) +if %VERMAJOR% lss 5 set GIT_VERSION=1.9.0.chromium.3-xp +if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=1.9.0.chromium.3-xp set GIT_BIN_DIR=git-%GIT_VERSION%_bin set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip set GIT_ZIP_URL=https://commondatastorage.googleapis.com/chrome-infra/%GIT_ZIP_FILE%