Merge branch 'master' into 1.3.15

cmderdev · Apr 6, 2020 · 2517f55 · 2517f55
2 parents 1af1266 + 1071221
commit 2517f55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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

diff --git a/vendor/init.bat b/vendor/init.bat
@@ -188,6 +188,10 @@ for /F "delims=" %%F in ('where git.exe 2^>nul') do (
     %lib_git% 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" (
@@ -370,4 +374,4 @@ set CMDER_INIT_END=%time%
 if %time_init% gtr 0 (
   "%cmder_root%\vendor\bin\timer.cmd" %CMDER_INIT_START% %CMDER_INIT_END%
 )
-exit /b
+exit /b