From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Jun 2013 21:53:20 +0000 (-0700)
Subject: Merge branch 'jk/unpack-entry-fallback-to-another'
X-Git-Tag: v1.8.4-rc0~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee64e345b1ac13cbb9c6a2343453fa3fc798367a;p=thirdparty%2Fgit.git

Merge branch 'jk/unpack-entry-fallback-to-another'

* jk/unpack-entry-fallback-to-another:
  unpack_entry: do not die when we fail to apply a delta
  t5303: drop "count=1" from corruption dd
---

ee64e345b1ac13cbb9c6a2343453fa3fc798367a