From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Sep 2013 18:43:47 +0000 (-0700)
Subject: Merge branch 'jk/duplicate-objects-in-packs'
X-Git-Tag: v1.8.5-rc0~115
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6c3456005359ccd94f991c8e306997c02a8f4b80

Merge branch 'jk/duplicate-objects-in-packs'

A packfile that stores the same object more than once is broken and
will be rejected by "git index-pack" that is run when receiving data
over the wire.

* jk/duplicate-objects-in-packs:
t5308: check that index-pack --strict detects duplicate objects
test index-pack on packs with recoverable delta cycles
add tests for indexing packs with delta cycles
sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
test-sha1: add a binary output mode
---

6c3456005359ccd94f991c8e306997c02a8f4b80