| commit | 2e8722fc9e34a53ae19f2b60b1d3038aa2af0ae6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 06:04:50 +0000 (13 22:04 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 06:04:50 +0000 (13 22:04 -0800) | ||
| tree | 1b1831c92a6ef6c87647f0952f01c51c660e75a4 | treesnapshot (tar.gz zip) |
| parent | 68f80f549092bcbb2409ba9c0eace73c085ba7cc | commitdiff |
| parent | f63c79dbc8c5670533557d311ed0e81fcfc9fe3a | commitdiff |
Merge branch 'jc/maint-pack-object-cycle' into maint
* jc/maint-pack-object-cycle:
pack-object: tolerate broken packs that have duplicated objects
Conflicts:
builtin/pack-objects.c
* jc/maint-pack-object-cycle:
pack-object: tolerate broken packs that have duplicated objects
Conflicts:
builtin/pack-objects.c
| builtin/pack-objects.c | diff1 | diff2 | blobhistory |