Revert "fix(#1976): support non-standard $GIT_DIR (#2012)"

This reverts commit 517dee64c1.
This commit is contained in:
Alexander Courtis
2023-04-29 16:42:51 +10:00
parent bb375fb203
commit 1f5bbc1efd
4 changed files with 38 additions and 82 deletions

View File

@@ -1,6 +1,7 @@
local M = {}
local log = require "nvim-tree.log"
local utils = require "nvim-tree.utils"
local has_cygpath = vim.fn.executable "cygpath" == 1
function M.get_toplevel(cwd)
local profile = log.profile_start("git toplevel %s", cwd)
@@ -17,9 +18,16 @@ function M.get_toplevel(cwd)
return nil
end
toplevel = utils.norm_path(toplevel)
if toplevel == nil then
return nil
-- git always returns path with forward slashes
if vim.fn.has "win32" == 1 then
-- msys2 git support
if has_cygpath then
toplevel = vim.fn.system("cygpath -w " .. vim.fn.shellescape(toplevel))
if vim.v.shell_error ~= 0 then
return nil
end
end
toplevel = toplevel:gsub("/", "\\")
end
-- remove newline
@@ -86,28 +94,4 @@ function M.file_status_to_dir_status(status, cwd)
return r
end
function M.get_git_directory(cwd)
local profile = log.profile_start("git directory %s", cwd)
local cmd = { "git", "-C", cwd, "rev-parse", "--absolute-git-dir" }
log.line("git", vim.inspect(cmd))
local git_dir = vim.fn.system(cmd)
log.raw("git", git_dir)
log.profile_end(profile)
if vim.v.shell_error ~= 0 or not git_dir or #git_dir == 0 or git_dir:match "fatal" then
return nil
end
git_dir = utils.norm_path(git_dir)
if git_dir == nil then
return nil
end
-- remove newline
return git_dir:sub(0, -2)
end
return M