]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/pack-objects.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 33fba9c f63c79d)
Merge branch 'jc/maint-pack-object-cycle'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:19:34 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:19:34 +0000 (15:19 -0800)
commitcddec4f8aea4809131dc1b1765d6c8e2a498a58e
tree126e27a28d41df858b34e7f85510d3a7081ed0d4tree | snapshot
parent33fba9c64e305c64b4d6f4c31f02c1dd7e8fbfa8commit | diff
parentf63c79dbc8c5670533557d311ed0e81fcfc9fe3acommit | diff
Merge branch 'jc/maint-pack-object-cycle'

* 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
Unnamed repository; edit this file 'description' to name the repository.