Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint
commitebc2e5a593ce7082bed03b2d22e2fe83583a9f5d
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:17 +0000 (29 10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:17 +0000 (29 10:35 -0700)
tree2455e6eaba3f324d883ee90069019388e80eb16e
parent9db18387056c713eca8f53bff3bb409d23117f1d
parent21134714787a02a37da15424d72c0119b2b8ed71
Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint

* jk/pack-objects-no-bitmap-when-splitting:
  pack-objects: turn off bitmaps when we split packs
builtin/pack-objects.c
t/t5310-pack-bitmaps.sh