From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Feb 2011 05:58:30 +0000 (-0800)
Subject: Merge branch 'nd/hash-object-sanity'
X-Git-Tag: v1.7.5-rc0~113
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a?hp=fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a

Merge branch 'nd/hash-object-sanity'

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

Conflicts:
cache.h
---