Skip to content

Avoid crash when git graph and log outputs desync on branch switch #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaxShymko wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

Avoid crash when git graph and log outputs desync on branch switch #1920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lua/neogit/lib/git/log.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,12 @@ local function parse_log(output, graph)
local oid = graph[i][1].oid
if oid then
local commit = commit_lookup[oid]
assert(commit, "No commit found for oid: " .. oid)

table.insert(commits, make_commit(commit, graph[i]))
current_commit = current_commit + 1
if commit then
table.insert(commits, make_commit(commit, graph[i]))
current_commit = current_commit + 1
else
table.insert(commits, { graph = graph[i] })
end
else
table.insert(commits, { graph = graph[i] })
end
Expand Down
Loading