mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pack): handle Git environment variables #35626

Browse Source 
Problem: Some environment variables which are useful when working inside
  a bare repository can affect any Git operation.

Solution: Explicitly unset problematic environment variables.
This commit is contained in:
Evgeni Chasnovski
2025-09-08 00:42:09 +03:00
committed by GitHub
parent 448f15ca39
commit fa3920282d
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/lua/vim/pack.lua
View File

@@ -107,7 +107,9 @@ local M = {}
local function git_cmd(cmd, cwd)
-- Use '-c gc.auto=0' to disable `stderr` "Auto packing..." messages
cmd = vim.list_extend({ 'git', '-c', 'gc.auto=0' }, cmd)
local sys_opts = { cwd = cwd, text = true, clear_env = true }
local env = vim.fn.environ() --- @type table<string,string>
env.GIT_DIR, env.GIT_WORK_TREE = nil, nil
local sys_opts = { cwd = cwd, text = true, env = env, clear_env = true }
local out = async.await(3, vim.system, cmd, sys_opts) --- @type vim.SystemCompleted
async.await(1, vim.schedule)
if out.code ~= 0 then

27
test/functional/plugin/pack_spec.lua
View File

@@ -664,6 +664,19 @@ describe('vim.pack', function()
eq('basic main', exec_lua('return require("basic")'))
end)
it('is not affected by special environment variables', function()
fn.setenv('GIT_WORK_TREE', fn.getcwd())
fn.setenv('GIT_DIR', vim.fs.joinpath(fn.getcwd(), '.git'))
local ref_environ = fn.environ()
exec_lua(function()
vim.pack.add({ repos_src.basic })
end)
eq('basic main', exec_lua('return require("basic")'))
eq(ref_environ, fn.environ())
end)
it('validates input', function()
local validate = function(err_pat, input)
local add_input = function()
@@ -1163,6 +1176,20 @@ describe('vim.pack', function()
eq({ 'return "fetch new 2"' }, fn.readfile(fetch_lua_file))
end)
it('is not affected by special environment variables', function()
fn.setenv('GIT_WORK_TREE', fn.getcwd())
fn.setenv('GIT_DIR', vim.fs.joinpath(fn.getcwd(), '.git'))
local ref_environ = fn.environ()
exec_lua(function()
vim.pack.add({ repos_src.fetch })
vim.pack.update({ 'fetch' }, { force = true })
end)
eq({ 'return "fetch new 2"' }, fn.readfile(fetch_lua_file))
eq(ref_environ, fn.environ())
end)
it('validates input', function()
local validate = function(err_pat, input)
local update_input = function()