Andrew's git / gitweb.git / diff
?
Merge branch 'jk/pack-objects-no-bitmap-when-splitting'
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 21:56:10 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 21:56:10 +0000 (14:56 -0700)
Splitting pack-objects output into multiple packs is incompatible
with the use of reachability bitmap.

* jk/pack-objects-no-bitmap-when-splitting:
pack-objects: turn off bitmaps when we split packs

1  2 
builtin/pack-objects.c patch | diff1 | diff2 | blob | history
t/t5310-pack-bitmaps.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/pack-objects.c
Simple merge
diff --cc t/t5310-pack-bitmaps.sh
Simple merge