Code review

- move norm_path to utils.lua
- fix comment #2012

Author: Damien MEHALA

lua/nvim-tree/explorer/explore.lua

@@ -30,8 +30,7 @@ local function populate_children(handle, cwd, node, git_status)
 
     t = get_type_from(t, abs)
     if
-      abs ~= git_status.git_dir
-      and not filters.should_filter(abs, filter_status)
+      not filters.should_filter(abs, filter_status)
       and not nodes_by_path[abs]
       and Watcher.is_fs_event_capable(abs)
     then

lua/nvim-tree/git/init.lua

@@ -162,6 +162,10 @@ function M.load_project_status(cwd)
         end)
       end
 
+      -- Add $GIT_DIR to the list of directory to ignore
+      local base_gitdir = utils.path_basename(git_directory)
+      table.insert(M.config.filesystem_watchers.ignore_dirs, base_gitdir)
+
       watcher = Watcher:new(git_directory, WATCHED_FILES, callback, {
         project_root = project_root,
       })
@@ -172,7 +176,6 @@ function M.load_project_status(cwd)
     files = git_status,
     dirs = git_utils.file_status_to_dir_status(git_status, project_root),
     watcher = watcher,
-    git_dir = git_directory,
   }
   return M.projects[project_root]
 end

lua/nvim-tree/git/utils.lua

@@ -1,23 +1,6 @@
 local M = {}
 local log = require "nvim-tree.log"
-
-local has_cygpath = vim.fn.executable "cygpath" == 1
-
-local function norm_path(path)
-  -- git always returns path with forward slashes
-  if vim.fn.has "win32" == 1 then
-    -- msys2 git support
-    if has_cygpath then
-      path = vim.fn.system("cygpath -w " .. vim.fn.shellescape(path))
-      if vim.v.shell_error ~= 0 then
-        return nil
-      end
-    end
-    path = path:gsub("/", "\\")
-  end
-
-  return path
-end
+local utils = require "nvim-tree.utils"
 
 function M.get_toplevel(cwd)
   local profile = log.profile_start("git toplevel %s", cwd)
@@ -34,7 +17,7 @@ function M.get_toplevel(cwd)
     return nil
   end
 
-  toplevel = norm_path(toplevel)
+  toplevel = utils.norm_path(toplevel)
   if toplevel == nil then
     return nil
   end

lua/nvim-tree/utils.lua

@@ -5,6 +5,8 @@ local M = {
   debouncers = {},
 }
 
+local has_cygpath = vim.fn.executable "cygpath" == 1
+
 M.is_unix = vim.fn.has "unix" == 1
 M.is_macos = vim.fn.has "mac" == 1 or vim.fn.has "macunix" == 1
 M.is_wsl = vim.fn.has "wsl" == 1
@@ -42,6 +44,21 @@ function M.path_split(path)
   return path:gmatch("[^" .. path_separator .. "]+" .. path_separator .. "?")
 end
 
+function M.norm_path(path)
+  if M.is_windows then
+    -- msys2 git support
+    if has_cygpath then
+      path = vim.fn.system("cygpath -w " .. vim.fn.shellescape(path))
+      if vim.v.shell_error ~= 0 then
+        return nil
+      end
+    end
+    path = path:gsub("/", "\\")
+  end
+
+  return path
+end
+
 ---Get the basename of the given path.
 ---@param path string
 ---@return string