fix(git): Bad file existence assertion in file_restore() (fixes sindrets#381)

sindrets · sindrets · commit ea5a7492a2e3 · 2023-06-14T20:00:23.000+02:00
Problem:    The method incorrectly asserts that the given file didn't
            exist in history.

Solution:   Actually use the provided commit SHA to make the correct
            assertion.
diff --git a/lua/diffview/vcs/adapters/git/init.lua b/lua/diffview/vcs/adapters/git/init.lua
@@ -1360,7 +1360,7 @@ GitAdapter.file_restore = async.wrap(function(self, path, kind, commit, callback
 
   -- Check if file exists in history
   _, code = self:exec_sync(
-    { "cat-file", "-e", fmt("%s:%s", kind == "staged" and "HEAD" or "", path) },
+    { "cat-file", "-e", fmt("%s:%s", commit or (kind == "staged" and "HEAD") or "", path) },
     self.ctx.toplevel
   )
   local exists_git = code == 0

Original file line number	Diff line number	Diff line change
`@@ -1360,7 +1360,7 @@ GitAdapter.file_restore = async.wrap(function(self, path, kind, commit, callback`
`1360`	`1360`
`1361`	`1361`	`-- Check if file exists in history`
`1362`	`1362`	`_, code = self:exec_sync(`
`1363`		`- { "cat-file", "-e", fmt("%s:%s", kind == "staged" and "HEAD" or "", path) },`
	`1363`	`+ { "cat-file", "-e", fmt("%s:%s", commit or (kind == "staged" and "HEAD") or "", path) },`
`1364`	`1364`	`self.ctx.toplevel`
`1365`	`1365`	`)`
`1366`	`1366`	`local exists_git = code == 0`