fix(diff): use git show when only displaying one commit (#155)

folke · Dec 25, 2022 · 037f242 · 037f242
1 parent ed8259b
commit 037f242
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lua/lazy/view/diff.lua b/lua/lazy/view/diff.lua
@@ -32,10 +32,12 @@ M.handlers = {
 
   ---@type LazyDiffFun
   git = function(plugin, diff)
-    local cmd = { "git", "diff" }
+    local cmd = { "git" }
     if diff.commit then
+      cmd[#cmd + 1] = "show"
       cmd[#cmd + 1] = diff.commit
     else
+      cmd[#cmd + 1] = "diff"
       cmd[#cmd + 1] = diff.from
       cmd[#cmd + 1] = diff.to
     end
@@ -44,10 +46,12 @@ M.handlers = {
 
   ---@type LazyDiffFun
   terminal_git = function(plugin, diff)
-    local cmd = { "git", "diff" }
+    local cmd = { "git" }
     if diff.commit then
+      cmd[#cmd + 1] = "show"
       cmd[#cmd + 1] = diff.commit
     else
+      cmd[#cmd + 1] = "diff"
       cmd[#cmd + 1] = diff.from
       cmd[#cmd + 1] = diff.to
     end

diff --git a/lua/lazy/view/init.lua b/lua/lazy/view/init.lua
@@ -38,14 +38,12 @@ function M.show(mode)
   M.view:update()
 end
 
----@param opts? {mode?:string}
-function M.create(opts)
+function M.create()
   local self = setmetatable({}, { __index = setmetatable(M, { __index = Float }) })
   ---@cast self LazyView
   Float.init(self)
 
   require("lazy.view.colors").setup()
-  opts = opts or {}
 
   self.state = vim.deepcopy(default_state)