diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:43:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:43:47 -0700 |
| commit | 6c3456005359ccd94f991c8e306997c02a8f4b80 (patch) | |
| tree | 5d8cff6466d5eb35a39d66adf94ec6374bed5f62 /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'nd/git-dir-pointing-at-gitfile' (diff) | |
| parent | t5308: check that index-pack --strict detects duplicate objects (diff) | |
| download | tgif-6c3456005359ccd94f991c8e306997c02a8f4b80.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions