git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68f80f5 f63c79d)
Merge branch 'jc/maint-pack-object-cycle' into maint
authorJunio C Hamano <redacted>
Wed, 14 Dec 2011 06:04:50 +0000 (22:04 -0800)
committerJunio C Hamano <redacted>
Wed, 14 Dec 2011 06:04:50 +0000 (22:04 -0800)
commit2e8722fc9e34a53ae19f2b60b1d3038aa2af0ae6
tree1b1831c92a6ef6c87647f0952f01c51c660e75a4tree | snapshot
parent68f80f549092bcbb2409ba9c0eace73c085ba7cccommit | diff
parentf63c79dbc8c5670533557d311ed0e81fcfc9fe3acommit | diff
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
builtin/pack-objects.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT