From fdf678343464a1ef596fff2ddb042cc1fc88c28c Mon Sep 17 00:00:00 2001 From: disrupted Date: Sat, 15 Mar 2025 18:33:18 +0100 Subject: [PATCH] fix(diff): set `--git-dir` argument to overwrite user defined workspace `$GIT_DIR` --- lua/lazy/view/diff.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/lazy/view/diff.lua b/lua/lazy/view/diff.lua index f4fe5af..f2c354b 100644 --- a/lua/lazy/view/diff.lua +++ b/lua/lazy/view/diff.lua @@ -23,18 +23,18 @@ M.handlers = { ---@type LazyDiffFun ["diffview.nvim"] = function(plugin, diff) - local args + local args = "--git-dir=.git" .. " " .. ("-C=%s"):format(plugin.dir) .. " " if diff.commit then - args = ("-C=%s"):format(plugin.dir) .. " " .. diff.commit .. "^!" + args = args .. diff.commit .. "^!" else - args = ("-C=%s"):format(plugin.dir) .. " " .. diff.from .. ".." .. diff.to + args = args .. diff.from .. ".." .. diff.to end vim.cmd("DiffviewOpen " .. args) end, ---@type LazyDiffFun git = function(plugin, diff) - local cmd = { "git" } + local cmd = { "git", "--git-dir=.git" } if diff.commit then cmd[#cmd + 1] = "show" cmd[#cmd + 1] = diff.commit @@ -48,7 +48,7 @@ M.handlers = { ---@type LazyDiffFun terminal_git = function(plugin, diff) - local cmd = { "git" } + local cmd = { "git", "--git-dir=.git" } if diff.commit then cmd[#cmd + 1] = "show" cmd[#cmd + 1] = diff.commit