Skip to content

perf(#3171): use vim.system() instead of vim.fn.system() to execute git toplevel #3175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 5, 2025
Merged

perf(#3171): use vim.system() instead of vim.fn.system() to execute git toplevel #3175

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f6f15c
fix(#3171): use vim.system() to determine git toplevel
przepompownia Aug 4, 2025
7fe2024
Don't use vim.trim
przepompownia Aug 4, 2025
f76e492
Ensure sdtout is a string
przepompownia Aug 4, 2025
5f7b11f
Keep Nvim 0.9 compatibility
przepompownia Aug 4, 2025
73a8c02
Use vim.system to query git config for status.showUntrackedFiles too
przepompownia Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lua/nvim-tree/git/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ local M = {
use_cygpath = false,
}

--- Execute system command
---@param cmd string[]
---@return string stdout
---@return integer exit code
local function system(cmd)
if vim.fn.has("nvim-0.10") == 1 then
local obj = vim.system(cmd):wait()
return obj.stdout or "", obj.code
else
return vim.fn.system(cmd), vim.v.shell_error
end
end

--- Retrieve the git toplevel directory
---@param cwd string path
---@return string|nil toplevel absolute path
Expand All @@ -16,12 +29,12 @@ function M.get_toplevel(cwd)
local cmd = { "git", "-C", cwd, "rev-parse", "--show-toplevel", "--absolute-git-dir" }
log.line("git", "%s", table.concat(cmd, " "))

local out = vim.fn.system(cmd)
local out, exitCode = system(cmd)

log.raw("git", out)
log.profile_end(profile)

if vim.v.shell_error ~= 0 or not out or #out == 0 or out:match("fatal") then
if exitCode ~= 0 or not out or #out == 0 or out:match("fatal") then
return nil, nil
end

Expand Down Expand Up @@ -73,7 +86,7 @@ function M.should_show_untracked(cwd)
local cmd = { "git", "-C", cwd, "config", "status.showUntrackedFiles" }
log.line("git", table.concat(cmd, " "))

local has_untracked = vim.fn.system(cmd)
local has_untracked = system(cmd)

log.raw("git", has_untracked)
log.profile_end(profile)
Expand Down
Loading