Merge branch 'jk/loose-object-info-report-error'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:30 +0000 (23:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:30 +0000 (23:29 -0700)
commitdfe46c5ce6e68d682f80f9874f0eb107e9fee797
tree7af1c20e18cad0a46b8c2259416ecbd85a36c697
parent3c833cae446364872b759c7622af2760a2f81a11
parent51054177b312ce0795f2866d4c3aed246eeccea9
Merge branch 'jk/loose-object-info-report-error'

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