From f41d791ae5b4993a9ccdcb3975113798803d7ee9 Mon Sep 17 00:00:00 2001 From: "mmoss@chromium.org" Date: Wed, 12 Feb 2014 03:40:26 +0000 Subject: [PATCH] Make new Windows git the default again. To force revert to the old git, and uninstall the new one, set: DEPOT_TOOLS_GIT_1852=0 BUG=341967 R=maruel@chromium.org Review URL: https://codereview.chromium.org/156713005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250622 0039d316-1c4b-4281-b951-d872f2087c98 --- bootstrap/win/win_tools.bat | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat index 2e74896bf..bd5abd3de 100644 --- a/bootstrap/win/win_tools.bat +++ b/bootstrap/win/win_tools.bat @@ -26,11 +26,8 @@ if "%1" == "force" ( :GIT_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 +if "%DEPOT_TOOLS_GIT_1852%" == "0" goto :GIT_1852_UNINSTALL +goto :GIT_1852_CHECK :GIT_1852_CHECK @@ -53,7 +50,7 @@ ver goto :GIT_180_CHECK -:GIT_180_FORCE +: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" (