Update to git-1.9.0.

bootstrap/win/win_tools.bat

Index: bootstrap/win/win_tools.bat
diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat
index 200447ce0c7673a53abdafb374867b462d0578e4..0a08a67efedbf0c2f4fee1836f68d4243f17024a 100644
--- a/bootstrap/win/win_tools.bat
+++ b/bootstrap/win/win_tools.bat
@@ -60,21 +60,30 @@ goto :END
 
 
 :GIT_CHECK
-if "%DEPOT_TOOLS_GIT_1852%" == "0" goto :GIT_1852_UNINSTALL
-goto :GIT_1852_CHECK
+goto :GIT_190_CHECK
+
+
+:GIT_190_CHECK
+if "%DEPOT_TOOLS_GIT_190%" == "0" goto :GIT_1852_CHECK

[mmoss, 2014/03/19 05:11:15]

I don't remember, do win vars == "0" if they are unset? If not, maybe this
should be != "1".

[szager1, 2014/03/19 05:41:57]

I tested this; it only evaluates true if the var is set to a literal "0".

[mmoss, 2014/03/19 14:17:11]

OK, I guess I just misunderstood the intent. I thought you were saying "if 190
isn't set, try 1852; if 1852 isn't set, try 180", but it's really "use 190
unless it's explicitly disabled, then use 1852, unless 1852 is explicitly
disabled, then use 180". I guess that's OK, but as more versions are supported,
it gets more tedious to enable an older version, because you have to explicitly
disable all the more recent ones (and by implication, be aware they've been
added and what the proper invocation is for disabling them).

Maybe the most recent one can always be "use unless disabled" but all the older
ones can be "don't use unless enabled", with a fallthrough to "oops, you forgot
to enable at least one version of git".

+set GIT_VERSION=1.9.0.chromium.1
+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%
+goto :GIT_COMMON
 
 
 :GIT_1852_CHECK
+if "%DEPOT_TOOLS_GIT_1852%" == "0" goto :GIT_180_CHECK
 set GIT_VERSION=1.8.5.2.chromium.1
+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%
 :: This git uses APIs that target WINVER 0x0502, so refuse to install it on
 :: anything older.
 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 goto :GIT_VER_UNSUPPORTED
 if %VERMAJOR% equ 5 if %VERMINOR% lss 2 goto :GIT_VER_UNSUPPORTED
-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%
 goto :GIT_COMMON
 
 
@@ -84,18 +93,6 @@ ver
 goto :GIT_180_CHECK
 
 
-:GIT_1852_UNINSTALL
-:: If the new git was installed, remove all installed git packages to trigger
-:: reinstallation of the old version.
-if exist "%WIN_TOOLS_ROOT_DIR%\git-1.8.5.2.chromium.1_bin" (
-  rmdir /S /Q "%WIN_TOOLS_ROOT_DIR%\git-1.8.5.2.chromium.1_bin"
-  if exist "%WIN_TOOLS_ROOT_DIR%\git-1.8.0_bin" (
-    rmdir /S /Q "%WIN_TOOLS_ROOT_DIR%\git-1.8.0_bin"
-  )
-)
-goto :GIT_180_CHECK
-
-
 :GIT_180_CHECK
 set GIT_VERSION=1.8.0
 set GIT_BIN_DIR=git-%GIT_VERSION%_bin
@@ -105,18 +102,17 @@ goto :GIT_COMMON
 
 
 :GIT_COMMON
-:: If the batch file exists, skip the git check.
-if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" goto :MSYS_PATH_CHECK
 if "%WIN_TOOLS_FORCE%" == "1" goto :GIT_INSTALL
-call git --version 2>nul 1>nul
-if errorlevel 1 goto :GIT_INSTALL
-goto :SVN_CHECK
-
-
-:MSYS_PATH_CHECK
-call find "mingw" "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\cmd\git.cmd" 2>nul 1>nul
-if errorlevel 1 goto :SVN_CHECK
-rmdir /S /Q "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%"
+if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\cmd\git.cmd" (
+  call "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\cmd\git.cmd" --version 2>nul 1>nul
+  if errorlevel 1 goto :GIT_INSTALL
+  rem Several git versions can live side-by-side; check the top-level
+  rem batch script to make sure it points to the desired version.
+  find "%GIT_BIN_DIR%" "%WIN_TOOLS_ROOT_DIR%\git.bat" 2>nul 1>nul
+  if errorlevel 1 goto :GIT_COPY_BATCH_FILES
+  goto :SVN_CHECK
+)
+goto :GIT_INSTALL
 
 
 :GIT_INSTALL
@@ -133,14 +129,18 @@ cscript //nologo //e:jscript "%~dp0unzip.js" "%ZIP_DIR%\git.zip" "%WIN_TOOLS_ROO
 if errorlevel 1 goto :GIT_FAIL
 if not exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\." goto :GIT_FAIL
 del "%ZIP_DIR%\git.zip"
+:: Ensure autocrlf and filemode are set correctly.
+call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --global core.autocrlf false

[mmoss, 2014/03/19 05:11:15]

Make these --system, to it modifies the config we ship in the git package,
rather than the user's config. Unless you're still planning to get rid of them
altogether, like we were talking about before.

[szager1, 2014/03/19 05:41:57]

Done.

+call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --global core.filemode false
+goto :GIT_COPY_BATCH_FILES
+
+
+:GIT_COPY_BATCH_FILES
 :: Create the batch files.
 call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\git.bat" "%WIN_TOOLS_ROOT_DIR%\git.bat" 1>nul
 call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\gitk.bat" "%WIN_TOOLS_ROOT_DIR%\gitk.bat" 1>nul
 call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\ssh.bat" "%WIN_TOOLS_ROOT_DIR%\ssh.bat" 1>nul
 call copy /y "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\ssh-keygen.bat" "%WIN_TOOLS_ROOT_DIR%\ssh-keygen.bat" 1>nul
-:: Ensure autocrlf and filemode are set correctly.
-call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --global core.autocrlf false
-call "%WIN_TOOLS_ROOT_DIR%\git.bat" config --global core.filemode false
 goto :SVN_CHECK