CarGDev/lazygit.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39 from kdheepak/fix-shell-not-reverting

Browse Source 
Fix shell not reverting to oldshell
This commit is contained in:
Dheepak Krishnamurthy
2021-07-14 14:00:30 -06:00
committed by GitHub
parent d3f6a7f629 08920a3288
commit 3dc36a8227
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lua/lazygit.lua
View File

@@ -26,6 +26,7 @@ local function project_root_dir()
-- try submodule first -- try submodule first
local gitdir = fn.system('cd "' .. fn.expand('%:p:h') .. '" && git rev-parse --show-superproject-working-tree') local gitdir = fn.system('cd "' .. fn.expand('%:p:h') .. '" && git rev-parse --show-superproject-working-tree')
if gitdir ~= '' then if gitdir ~= '' then
vim.o.shell = oldshell
return trim(gitdir) return trim(gitdir)
end end
@@ -33,6 +34,7 @@ local function project_root_dir()
local gitdir = fn.system('cd "' .. fn.expand('%:p:h') .. '" && git rev-parse --show-toplevel') local gitdir = fn.system('cd "' .. fn.expand('%:p:h') .. '" && git rev-parse --show-toplevel')
local isgitdir = fn.matchstr(gitdir, '^fatal:.*') == '' local isgitdir = fn.matchstr(gitdir, '^fatal:.*') == ''
if isgitdir then if isgitdir then
vim.o.shell = oldshell
return trim(gitdir) return trim(gitdir)
end end
@@ -41,6 +43,7 @@ local function project_root_dir()
'cd "' .. fn.fnamemodify(fn.resolve(fn.expand('%:p')), ':h') .. '" && git rev-parse --show-toplevel') 'cd "' .. fn.fnamemodify(fn.resolve(fn.expand('%:p')), ':h') .. '" && git rev-parse --show-toplevel')
isgitdir = fn.matchstr(gitdir, '^fatal:.*') == '' isgitdir = fn.matchstr(gitdir, '^fatal:.*') == ''
if isgitdir then if isgitdir then
vim.o.shell = oldshell
return trim(gitdir) return trim(gitdir)
end end