apply merge before checking git

This commit is contained in:
kiyan
2021-06-05 11:49:41 +02:00
parent f56ac7884c
commit 82f1598bd4

View File

@@ -337,12 +337,12 @@ function M.populate(entries, cwd, parent_node)
table.insert(entries, file) table.insert(entries, file)
end end
utils.merge_sort(entries, node_comparator)
if (not icon_config.show_git_icon) and vim.g.nvim_tree_git_hl ~= 1 then if (not icon_config.show_git_icon) and vim.g.nvim_tree_git_hl ~= 1 then
return return
end end
utils.merge_sort(entries, node_comparator)
git.update_status(entries, cwd, parent_node) git.update_status(entries, cwd, parent_node)
end end