Merge branch 'nd/hash-object-sanity'
commitfc7ae9c156775cc9679c0bcc7156abb7dba1bd3a
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (27 21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (27 21:58 -0800)
tree176d6a941baafd95b6a71e92f4ae2d077e5c6c95
parent99f45c2a5db46c1397a80b0ab282456006b40cb1
parentc879daa23729547fb28aa7e8783c5e4e619a9e7c
Merge branch 'nd/hash-object-sanity'

* nd/hash-object-sanity:
  Make hash-object more robust against malformed objects

Conflicts:
cache.h
cache.h
read-cache.c
sha1_file.c