Merge branch 'jk/pack-shallow-always-without-bitmap'
commita3d54f9a1fa481727a849b8753fc9d1abafe6583
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (26 11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (26 11:16 -0700)
tree0b587d35e77310dd8fdcf6bb8990a525cd189710
parent212d781c967317a05a704609ddf3ffc8a09f8590
parentf7f91086a376ba53f8270ea80b7bbbd8274c3c2d
Merge branch 'jk/pack-shallow-always-without-bitmap'

Reachability bitmaps do not work with shallow operations.
Fixes regression in 2.0.

* jk/pack-shallow-always-without-bitmap:
  pack-objects: turn off bitmaps when we see --shallow lines
builtin/pack-objects.c