From 251968b4c6a420d2d2fc92a30e3c25c1abbe072b Mon Sep 17 00:00:00 2001 From: andyburgess Date: Fri, 21 Feb 2020 11:52:52 -0500 Subject: [PATCH 1/2] Fixes #2247, fixes #2254 --- vendor/init.bat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index c6f519d..cd4e080 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -188,6 +188,10 @@ for /F "delims=" %%F in ('where git.exe 2^>nul') do ( call :compare_git_versions ) +if defined GIT_INSTALL_ROOT ( + goto :FOUND_GIT +) + :: our last hope: our own git... :VENDORED_GIT 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" ( set "GIT_INSTALL_ROOT=%test_dir:~0,-4%" set test_dir= - goto :FOUND_GIT ) else if %errorlevel% geq 0 ( set "GIT_INSTALL_ROOT=%test_dir%" set test_dir= - goto :FOUND_GIT ) else ( call :verbose_output Found old %GIT_VERSION_USER% in "%test_dir%", but not using... set test_dir= From 1071221468f2f75f2b63e482deab69c9ca986219 Mon Sep 17 00:00:00 2001 From: Michael Roy Date: Sat, 14 Mar 2020 14:01:06 +0100 Subject: [PATCH 2/2] Fix an issue with clink.find_files() return order not always consistent, leading to .init.lua not being run first lua path being broken (#2278) --- vendor/clink.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vendor/clink.lua b/vendor/clink.lua index c029966..8d72186 100644 --- a/vendor/clink.lua +++ b/vendor/clink.lua @@ -431,6 +431,8 @@ clink.prompt.register_filter(svn_prompt_filter, 50) clink.prompt.register_filter(percent_prompt_filter, 51) local completions_dir = clink.get_env('CMDER_ROOT')..'/vendor/clink-completions/' +-- Execute '.init.lua' first to ensure package.path is set properly +dofile(completions_dir..'.init.lua') for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do -- Skip files that starts with _. This could be useful if some files should be ignored if not string.match(lua_module, '^_.*') then