fix(git): git folder fixes and improvements (#1809)

* coding style

* outlined git.show_on_open_dirs behavior

* show some icon on opendir even if show_on_open_dir=false

and show all children's status on parent

* fixed renamed icon not showing

* sorted icons

* removed DU from deleted as file will show up in tree

* fixed update_git_status in reloaders not tested

* fixed Api.git.reload()

Tested update_git_status in reloaders.lua

* sort icon only if not git signcolumn

* fixed crashing when root dir isn't git dir

* made git.show_on_dirs doc more concise

* git_statuses -> git_status for consistency

* explorer/common.lua -> explorer/node.lua

* fixed #1784 conflict

* don't order icons

* Revert "don't order icons"

This reverts commit 23f6276ef7.

lua/nvim-tree/git/utils.lua

@@ -55,24 +55,43 @@ function M.should_show_untracked(cwd)
   return untracked[cwd]
 end
 
+local function nil_insert(t, k)
+  t = t or {}
+  t[k] = true
+  return t
+end
+
 function M.file_status_to_dir_status(status, cwd)
-  local dirs = {}
+  local direct = {}
   for p, s in pairs(status) do
     if s ~= "!!" then
       local modified = vim.fn.fnamemodify(p, ":h")
-      dirs[modified] = s
+      direct[modified] = nil_insert(direct[modified], s)
     end
   end
 
-  for dirname, s in pairs(dirs) do
-    local modified = dirname
-    while modified ~= cwd and modified ~= "/" do
-      modified = vim.fn.fnamemodify(modified, ":h")
-      dirs[modified] = s
+  local indirect = {}
+  for dirname, statuses in pairs(direct) do
+    for s, _ in pairs(statuses) do
+      local modified = dirname
+      while modified ~= cwd and modified ~= "/" do
+        modified = vim.fn.fnamemodify(modified, ":h")
+        indirect[modified] = nil_insert(indirect[modified], s)
+      end
     end
   end
 
-  return dirs
+  local r = { indirect = indirect, direct = direct }
+  for _, d in pairs(r) do
+    for dirname, statuses in pairs(d) do
+      local new_statuses = {}
+      for s, _ in pairs(statuses) do
+        table.insert(new_statuses, s)
+      end
+      d[dirname] = new_statuses
+    end
+  end
+  return r
 end
 
 return M