Skip to content

fix: prevent --literal-pathspecs leaking into git hooks #1893

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

Open
disrupted wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −14
Open

fix: prevent --literal-pathspecs leaking into git hooks #1893

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 31 additions & 14 deletions lua/neogit/lib/git/cli.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,22 @@ local function get_git_executable()
return config.get_git_executable()
end

local hook_commands = {
commit = true,
merge = true,
rebase = true,
checkout = true,
push = true,
}

local function hooks_enabled(subcommand, cmd)
if not hook_commands[subcommand] then
return false
end

return not vim.tbl_contains(cmd, "--no-verify")
end

---@class GitCommandSetup
---@field flags table|nil
---@field options table|nil
Expand Down Expand Up @@ -1189,20 +1205,21 @@ local function new_builder(subcommand)
table.insert(cmd, "-")
end

-- stylua: ignore
cmd = util.merge(
{
get_git_executable(),
"--no-pager",
"--literal-pathspecs",
"--no-optional-locks",
"-c", "core.preloadindex=true",
"-c", "color.ui=always",
"-c", "diff.noprefix=false",
subcommand
},
cmd
)
local base = {
get_git_executable(),
"--no-pager",
"--no-optional-locks",
"-c", "core.preloadindex=true",
"-c", "color.ui=always",
"-c", "diff.noprefix=false",
subcommand,
}

if not hooks_enabled(subcommand, cmd) then
table.insert(base, 3, "--literal-pathspecs")
end

cmd = util.merge(base, cmd)

return process.new {
cmd = cmd,
Expand Down