]> git.proxmox.com Git - libgit2.git/commit
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: da6720f) | patch
Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()
authorPierre-Olivier Latour <pol@mac.com>
Wed, 10 Jun 2015 17:09:10 +0000 (10:09 -0700)
committerPierre-Olivier Latour <pol@mac.com>
Wed, 10 Jun 2015 17:09:10 +0000 (10:09 -0700)
commit50456801c017e22696b9d756daf3a4a66e6b9bb8
tree440105769c6eabeece4dcd888b33baa23a2e8480tree
parentda6720fcc5d9f368e7aa562384439498c1bf307ecommit | diff
Fixed handling of GIT_DELTA_CONFLICTED  in git_diff_find_similar()

git_diff_find_similar() now ignores git_diff_delta records with a status
of GIT_DELTA_CONFLICTED, which fixes a crash due to assert() being hit.
src/diff_tform.c diff | blob | blame | history
The git library used in some Proxmox tool chains