tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(git): Fix shell args on windows. (#349)

Browse Source
This commit is contained in:
Sindre T. Strøm
2021-05-17 21:54:19 +02:00
committed by GitHub
parent e9f4f5e1b4
commit 8bc814de2b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lua/nvim-tree/git.lua
View File

@@ -10,11 +10,17 @@ local not_git = 'not a git repo'
local is_win = vim.api.nvim_call_function("has", {"win32"}) == 1 local is_win = vim.api.nvim_call_function("has", {"win32"}) == 1
local function update_root_status(root) local function update_root_status(root)
local e_root = vim.fn.shellescape(root)
local untracked = ' -u' local untracked = ' -u'
if vim.fn.trim(vim.fn.system('git -C \'' .. root .. '\' config --type=bool status.showUntrackedFiles')) == 'false' then
local cmd = "git -C " .. e_root .. " config --type=bool status.showUntrackedFiles"
if vim.trim(vim.fn.system(cmd)) == 'false' then
untracked = '' untracked = ''
end end
local status = vim.fn.systemlist('git -C \'' .. root .. '\' status --porcelain=v1 --ignored=matching'..untracked)
cmd = "git -C " .. e_root .. " status --porcelain=v1 --ignored=matching" .. untracked
local status = vim.fn.systemlist(cmd)
roots[root] = {} roots[root] = {}
gitignore_map[root] = {} gitignore_map[root] = {}
@@ -61,7 +67,8 @@ local function get_git_root(path)
end end
local function create_root(cwd) local function create_root(cwd)
local git_root = vim.fn.system('cd "'..cwd..'" && git rev-parse --show-toplevel') local cmd = "git -C " .. vim.fn.shellescape(cwd) .. " rev-parse --show-toplevel"
local git_root = vim.fn.system(cmd)
if not git_root or #git_root == 0 or git_root:match('fatal') then if not git_root or #git_root == 0 or git_root:match('fatal') then
roots[cwd] = not_git roots[cwd] = not_git