Merge branch 'jk/repack-pack-keep-objects'
commitb7ce583682e26910c98e71d55babd2ed23a006ad
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:21:51 +0000 (25 12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:21:51 +0000 (25 12:21 -0700)
tree5782c8f1813906ee72002bbe9b5d0cf4101df7ab
parent9ce7100b1c1aa3a1523057c904f081abcf87ed60
parentd078d85bc3cd74bbe1f230feb26cbe28f29d6d25
Merge branch 'jk/repack-pack-keep-objects'

Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.

* jk/repack-pack-keep-objects:
  repack: s/write_bitmap/&s/ in code
  repack: respect pack.writebitmaps
  repack: do not accidentally pack kept objects by default
builtin/repack.c
t/t7700-repack.sh