Andrew's git / gitweb.git / diff
?
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)
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

1  2 
builtin/index-pack.c patch | diff1 | diff2 | blob | history
sha1_file.c patch | diff1 | diff2 | blob | history
diff --cc builtin/index-pack.c
Simple merge
diff --cc sha1_file.c
Simple merge