mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 14:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pack): skip git stash during install

Browse Source 
Problem: Installing plugin is done via `git clone --no-checkout ...`
  (to not end up with default branch code in case of invalid `version`).
  This leaves cloned repo in a state that `git stash` will actually add
  an entry to the stash list. Although not critical, better to not have
  that if possible.

Solution: explicitly skip `git stash` step in checkout during install.
This commit is contained in:
Evgeni Chasnovski
2026-01-12 15:53:36 +02:00
parent 025c0c34ce
commit 8f0b8a2c27
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,15 +654,18 @@ end
--- @async --- @async
--- @param p vim.pack.Plug --- @param p vim.pack.Plug
--- @param timestamp string --- @param timestamp string
local function checkout(p, timestamp) --- @param skip_stash? boolean
local function checkout(p, timestamp, skip_stash)
infer_revisions(p) infer_revisions(p)
local stash_cmd = { 'stash', '--quiet' } if not skip_stash then
if git_version > vim.version.parse('2.13') then local stash_cmd = { 'stash', '--quiet' }
stash_cmd[#stash_cmd + 1] = '--message' if git_version > vim.version.parse('2.13') then
stash_cmd[#stash_cmd + 1] = ('vim.pack: %s Stash before checkout'):format(timestamp) stash_cmd[#stash_cmd + 1] = '--message'
stash_cmd[#stash_cmd + 1] = ('vim.pack: %s Stash before checkout'):format(timestamp)
end
git_cmd(stash_cmd, p.path)
end end
git_cmd(stash_cmd, p.path)
git_cmd({ 'checkout', '--quiet', p.info.sha_target }, p.path) git_cmd({ 'checkout', '--quiet', p.info.sha_target }, p.path)
@@ -691,7 +694,7 @@ local function install_list(plug_list, confirm)
-- Prefer revision from the lockfile instead of using `version` -- Prefer revision from the lockfile instead of using `version`
p.info.sha_target = (plugin_lock.plugins[p.spec.name] or {}).rev p.info.sha_target = (plugin_lock.plugins[p.spec.name] or {}).rev
checkout(p, timestamp) checkout(p, timestamp, true)
p.info.installed = true p.info.installed = true
trigger_event(p, 'PackChanged', 'install') trigger_event(p, 'PackChanged', 'install')

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

@@ -369,6 +369,11 @@ describe('vim.pack', function()
vim.pack.add({ repos_src.basic }) vim.pack.add({ repos_src.basic })
end) end)
eq(exec_lua('return #_G.event_log'), 0) eq(exec_lua('return #_G.event_log'), 0)
-- Should not create redundant stash entry
local basic_path = pack_get_plug_path('basic')
local stash_list = system_sync({ 'git', 'stash', 'list' }, { cwd = basic_path }).stdout or ''
eq('', stash_list)
end) end)
it('passes `data` field through to `opts.load`', function() it('passes `data` field through to `opts.load`', function()