RepoMirrors/gitsigns.nvim
1
0
Fork 0
mirror of https://github.com/lewis6991/gitsigns.nvim synced 2025-02-20 22:47:23 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(repo): make sure --git-dir is always provided --work-tree

Browse Source 
gitdir and worktree must be provided together. From `man git`:
> Specifying the location of the ".git" directory using this option (or GIT_DIR environment
> variable) turns off the repository discovery that tries to find a directory with ".git"
> subdirectory (which is how the repository and the top-level of the working tree are
> discovered), and tells Git that you are at the top level of the working tree. If you are
> not at the top-level directory of the working tree, you should tell Git where the
> top-level of the working tree is, with the --work-tree=<path> option (or GIT_WORK_TREE
> environment variable)

If not then toplevel can be incorrectly calculated.
This commit is contained in:
Lewis Russell 2025-02-05 13:53:44 +00:00 committed by Lewis Russell
parent 0883d0f67c
commit 310018d543
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lua/gitsigns/git/repo.lua
View File

@ -204,9 +204,9 @@ end
--- @async
--- @param cwd string
--- @param gitdir? string
--- @param toplevel? string
--- @param worktree? string
--- @return Gitsigns.RepoInfo? info, string? err
function M.get_info(cwd, gitdir, toplevel)
function M.get_info(cwd, gitdir, worktree)
-- Does git rev-parse have --absolute-git-dir, added in 2.13:
-- https://public-inbox.org/git/20170203024829.8071-16-szeder.dev@gmail.com/
local has_abs_gd = check_version(2, 13)
@ -216,12 +216,21 @@ function M.get_info(cwd, gitdir, toplevel)
local args = {}
if gitdir then
vim.list_extend(args, { '--git-dir', gitdir })
end
if toplevel then
vim.list_extend(args, { '--work-tree', toplevel })
if gitdir and worktree then
-- gitdir and worktree must be provided together from `man git`:
-- > Specifying the location of the ".git" directory using this option (or GIT_DIR environment
-- > variable) turns off the repository discovery that tries to find a directory with ".git"
-- > subdirectory (which is how the repository and the top-level of the working tree are
-- > discovered), and tells Git that you are at the top level of the working tree. If you are
-- > not at the top-level directory of the working tree, you should tell Git where the
-- > top-level of the working tree is, with the --work-tree=<path> option (or GIT_WORK_TREE
-- > environment variable)
vim.list_extend(args, {
'--git-dir',
gitdir,
'--work-tree',
worktree,
})
end
vim.list_extend(args, {
@ -234,7 +243,7 @@ function M.get_info(cwd, gitdir, toplevel)
local stdout, stderr, code = git_command(args, {
ignore_error = true,
cwd = toplevel or cwd,
cwd = worktree or cwd,
})
-- If the repo has no commits yet, rev-parse will fail. Ignore this error.
@ -257,6 +266,10 @@ function M.get_info(cwd, gitdir, toplevel)
gitdir_r = assert(uv.fs_realpath(gitdir_r))
end
if gitdir and not worktree and gitdir ~= gitdir_r then
log.eprintf('expected gitdir to be %s, got %s', gitdir, gitdir_r)
end
return {
toplevel = toplevel_r,
gitdir = gitdir_r,