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

1  2 
builtin/repack.c
t/t7700-repack.sh

Simple merge
Simple merge