Merge branch 'jk/unpack-entry-fallback-to-another'
commitee64e345b1ac13cbb9c6a2343453fa3fc798367a
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:20 +0000 (23 14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:20 +0000 (23 14:53 -0700)
treef410dbf23e0cb15a71e853358b8610b470360121
parent23983a473dc889cfba8a64f040942298a6f5f99a
parent1ee886c1f08f4dd672a342b7811191b02291a597
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
sha1_file.c