diff --git a/vendor/init.bat b/vendor/init.bat index a7bf662..1e1005b 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -65,18 +65,23 @@ if not defined TERM set TERM=cygwin set test_dir= ) ) + :: our last hope: our own git... :VENDORED_GIT @if exist "%CMDER_ROOT%\vendor\git-for-windows" ( set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows" + rem add the minimal git commands to the front of the path + set "PATH=%GIT_INSTALL_ROOT%\cmd;%PATH%" ) else ( goto :NO_GIT ) :FOUND_GIT :: Add git to the path -if defined GIT_INSTALL_ROOT ( - set "PATH=%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\usr\share\vim\vim74;%PATH%" +@if defined GIT_INSTALL_ROOT ( + rem add the unix commands including bash in GIT\bin at the end to not shadow windows commands like more + echo Enhancing PATH with unix commands from git [%GIT_INSTALL_ROOT%] + set "PATH=%PATH%;%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\usr\share\vim\vim74" :: define SVN_SSH so we can use git svn with ssh svn repositories if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe" )