From 82f1598bd4388c8089cf08007b17a3555c0328f0 Mon Sep 17 00:00:00 2001
From: kiyan <yazdani.kiyan@protonmail.com>
Date: Sat, 5 Jun 2021 11:49:41 +0200
Subject: [PATCH] apply merge before checking git

---
 lua/nvim-tree/populate.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-tree/populate.lua b/lua/nvim-tree/populate.lua
index a9557368..36fbfa35 100644
--- 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