Merge branch 'jk/loose-object-info-report-error' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:08 +0000 (00:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:08 +0000 (00:55 -0700)
commit3a33761d945c9c79254373cb2b136521ee77c54f
tree7bc49bff251f7c25b34035a66b1fd8d5acb1154a
parent5573b2c49bc73bf72833d423cd8be0e91d18baf9
parent51054177b312ce0795f2866d4c3aed246eeccea9
Merge branch 'jk/loose-object-info-report-error' into next

Update error handling for codepath that deals with corrupt loose
objects.

* jk/loose-object-info-report-error:
  index-pack: detect local corruption in collision check
  sha1_loose_object_info: return error for corrupted objects
builtin/index-pack.c
sha1_file.c