apply merge before checking git

2021-06-05 11:49:41 +02:00
parent f56ac7884c
commit 82f1598bd4
1 changed files with 2 additions and 2 deletions
--- a/lua/nvim-tree/populate.lua
+++ b/lua/nvim-tree/populate.lua
@@ -337,12 +337,12 @@ function M.populate(entries, cwd, parent_node)
    table.insert(entries, file)
  end

+  utils.merge_sort(entries, node_comparator)
+
  if (not icon_config.show_git_icon) and vim.g.nvim_tree_git_hl ~= 1 then
    return
  end

-  utils.merge_sort(entries, node_comparator)
-
  git.update_status(entries, cwd, parent_node)
 end