search

cmarcusreid / git-status-cache

High performance cache for git repository status. Clients can retrieve information via named pipe.
MIT License
16 stars 4 forks source link

libgit2 reports a subset conflicts as two separate status entries with the same path. #15

Closed cmarcusreid closed 8 years ago

cmarcusreid commented 8 years ago

Old code assumed that conflict status entries always included a valid index_to_workdir; this could incorrectly result in a rare crash when index_to_workdir was null.

Update conflict handling code to check for index_to_workdir and head_to_index before inspecting.