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

fixed #1784 conflict

Browse Source
This commit is contained in:
chomosuke
2022-12-13 14:06:04 +13:00
parent a61763f519
commit c4b93dbae9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lua/nvim-tree/explorer/filters.lua
View File

@@ -24,7 +24,9 @@ local function git(path, git_status)
end end
-- default status to clean -- default status to clean
local status = git_status.files[path] or git_status.dirs[path] or " " local status = git_status.files[path]
status = status or git_status.dirs.direct[path] and git_status.dirs.direct[path][1]
status = status or git_status.dirs.indirect[path] and git_status.dirs.indirect[path][1]
-- filter ignored; overrides clean as they are effectively dirty -- filter ignored; overrides clean as they are effectively dirty
if M.config.filter_git_ignored and status == "!!" then if M.config.filter_git_ignored and status == "!!" then
@@ -32,7 +34,7 @@ local function git(path, git_status)
end end
-- filter clean -- filter clean
if M.config.filter_git_clean and status == " " then if M.config.filter_git_clean and not status then
return true return true
end end