diff options
| author | Brodie Rao <brodie@sf.io> | 2013-06-06 14:49:14 -0700 |
|---|---|---|
| committer | Brodie Rao <brodie@sf.io> | 2013-08-08 00:41:16 -0700 |
| commit | d19bcb335256fddc5dd1289f1772d4d864b54ec0 (patch) | |
| tree | ab91524d7c9e7135ce5ce347a734ff535fdc5732 /tests-clar/resources/duplicate.git | |
| parent | c7d4904c47d493073b8f816d2b17dcf68eefe26d (diff) | |
| download | libgit2-d19bcb335256fddc5dd1289f1772d4d864b54ec0.tar.gz | |
odb_pack: handle duplicate objects from different packs
This is based on 24634c6fd02b2240e4a93fad70a08220f8fb793a.
This also corrects an issue with error codes being mixed up with the
number of found objects.
Diffstat (limited to 'tests-clar/resources/duplicate.git')
| -rw-r--r-- | tests-clar/resources/duplicate.git/objects/info/packs | 1 | ||||
| -rw-r--r-- | tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.idx | bin | 0 -> 1100 bytes | |||
| -rw-r--r-- | tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack | bin | 0 -> 47 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/tests-clar/resources/duplicate.git/objects/info/packs b/tests-clar/resources/duplicate.git/objects/info/packs index 3696a7d36..d0fdf905e 100644 --- a/tests-clar/resources/duplicate.git/objects/info/packs +++ b/tests-clar/resources/duplicate.git/objects/info/packs @@ -1,2 +1,3 @@ P pack-e87994ad581c9af946de0eb890175c08cd005f38.pack +P pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack diff --git a/tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.idx b/tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.idx Binary files differnew file mode 100644 index 000000000..9f78f6e0f --- /dev/null +++ b/tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.idx diff --git a/tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack b/tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack Binary files differnew file mode 100644 index 000000000..d1dd3b61a --- /dev/null +++ b/tests-clar/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack |