images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-10 09:49:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2265 from andyburgess/master

Browse Source 
Fixes #2247, fixes #2254
This commit is contained in:
Dax T Games 2020-03-05 21:22:08 -05:00 committed by GitHub
commit a92bb1947f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/init.bat vendored
View File

@ -188,6 +188,10 @@ for /F "delims=" %%F in ('where git.exe 2^>nul') do (
call :compare_git_versions call :compare_git_versions
) )
if defined GIT_INSTALL_ROOT (
goto :FOUND_GIT
)
:: our last hope: our own git... :: our last hope: our own git...
:VENDORED_GIT :VENDORED_GIT
if exist "%CMDER_ROOT%\vendor\git-for-windows" ( if exist "%CMDER_ROOT%\vendor\git-for-windows" (
@ -399,11 +403,9 @@ exit /b
if %errorlevel% geq 0 if exist "%test_dir:~0,-4%\cmd\git.exe" ( if %errorlevel% geq 0 if exist "%test_dir:~0,-4%\cmd\git.exe" (
set "GIT_INSTALL_ROOT=%test_dir:~0,-4%" set "GIT_INSTALL_ROOT=%test_dir:~0,-4%"
set test_dir= set test_dir=
goto :FOUND_GIT
) else if %errorlevel% geq 0 ( ) else if %errorlevel% geq 0 (
set "GIT_INSTALL_ROOT=%test_dir%" set "GIT_INSTALL_ROOT=%test_dir%"
set test_dir= set test_dir=
goto :FOUND_GIT
) else ( ) else (
call :verbose_output Found old %GIT_VERSION_USER% in "%test_dir%", but not using... call :verbose_output Found old %GIT_VERSION_USER% in "%test_dir%", but not using...
set test_dir= set test_dir=