Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2778)

Unified Diff: bootstrap/win/win_tools.bat

Issue 150203005: Revert default Windows git to the old version. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bootstrap/win/win_tools.bat
===================================================================
--- bootstrap/win/win_tools.bat (revision 250235)
+++ bootstrap/win/win_tools.bat (working copy)
@@ -26,10 +26,11 @@
:GIT_CHECK
-call ver | findstr "XP" 2>nul 1>nul
-if errorlevel 0 goto :GIT_XP_CHECK
-if "%DEPOT_TOOLS_GIT_1852%" == "0" goto :GIT_180_CHECK
-goto :GIT_1852_CHECK
+if "%DEPOT_TOOLS_GIT_1852%" == "1" goto :GIT_1852_CHECK
+:: Our new build of git doesn't work on some systems (e.g. uses newer APIs than
+:: available in XP), so force systems back to the old git while the failures
+:: are investigated, unless the new git was explicitly requested above.
+goto :GIT_180_FORCE
:GIT_1852_CHECK
@@ -40,10 +41,9 @@
goto :GIT_COMMON
-:: Our new build of git doesn't work on XP (uses newer APIs).
-:GIT_XP_CHECK
-:: If the new git was installed, remove all old git packages and reinstall the
-:: correct version from scratch.
+:GIT_180_FORCE
+:: 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" (
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698