nvim-plugins/gitsigns.nvim
1
0
Fork 0
mirror of https://github.com/lewis6991/gitsigns.nvim synced 2024-09-16 14:34:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(blame): handle changes from git 2.41

Browse source
This commit is contained in:
Lewis Russell 2023-06-07 10:04:03 +01:00
parent f868d82a36
commit 4455bb5364
2 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lua/gitsigns/git.lua generated
View file

@ -560,16 +560,18 @@ end
--- @async
function Obj:run_blame(lines, lnum, ignore_whitespace)
local not_committed = {
author = 'Not Committed Yet',
['author_mail'] = '<not.committed.yet>',
committer = 'Not Committed Yet',
['committer_mail'] = '<not.committed.yet>',
}
if not self.object_name or self.repo.abbrev_head == '' then
-- As we support attaching to untracked files we need to return something if
-- the file isn't isn't tracked in git.
-- If abbrev_head is empty, then assume the repo has no commits
return {
author = 'Not Committed Yet',
['author_mail'] = '<not.committed.yet>',
committer = 'Not Committed Yet',
['committer_mail'] = '<not.committed.yet>',
}
return not_committed
end
local args = {
@ -611,6 +613,15 @@ function Obj:run_blame(lines, lnum, ignore_whitespace)
end
end
end
-- New in git 2.41:
-- The output given by "git blame" that attributes a line to contents
-- taken from the file specified by the "--contents" option shows it
-- differently from a line attributed to the working tree file.
if ret.author_mail == '<external.file>' then
ret = vim.tbl_extend('force', ret, not_committed)
end
return ret
end

23
teal/gitsigns/git.tl
View file

@ -560,16 +560,18 @@ end
--- @async
function Obj:run_blame(lines: {string}, lnum: number, ignore_whitespace: boolean): M.BlameInfo
local not_committed = {
author = 'Not Committed Yet',
['author_mail'] = '<not.committed.yet>',
committer = 'Not Committed Yet',
['committer_mail'] = '<not.committed.yet>',
}
if not self.object_name or self.repo.abbrev_head == '' then
-- As we support attaching to untracked files we need to return something if
-- the file isn't isn't tracked in git.
-- If abbrev_head is empty, then assume the repo has no commits
return {
author = 'Not Committed Yet',
['author_mail'] = '<not.committed.yet>',
committer = 'Not Committed Yet',
['committer_mail'] = '<not.committed.yet>',
}
return not_committed
end
local args = {
@ -611,6 +613,15 @@ function Obj:run_blame(lines: {string}, lnum: number, ignore_whitespace: boolean
end
end
end
-- New in git 2.41:
-- The output given by "git blame" that attributes a line to contents
-- taken from the file specified by the "--contents" option shows it
-- differently from a line attributed to the working tree file.
if ret.author_mail == '<external.file>' then
ret = vim.tbl_extend('force', ret, not_committed as table) as {string:any}
end
return ret as M.BlameInfo
end