Merge branch 'dt/disable-bitmap-in-auto-gc' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:06 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:06 +0000 (13:32 -0800)
commit81037171a59db996e05b98878359362ead6029f9
tree857bc58982cc30c418c38906f88894736dd0877f
parentbb7c47a452ce4fa22d25da6a5e7684dbbf7033e2
parent1c409a705cb30ae3db6cdd48757c4a85f51456d4
Merge branch 'dt/disable-bitmap-in-auto-gc' into maint

It is natural that "git gc --auto" may not attempt to pack
everything into a single pack, and there is no point in warning
when the user has configured the system to use the pack bitmap,
leading to disabling further "gc".

* dt/disable-bitmap-in-auto-gc:
  repack: die on incremental + write-bitmap-index
  auto gc: don't write bitmaps for incremental repacks
t/t5310-pack-bitmaps.sh