Merge branch 'jk/pack-shallow-always-without-bitmap' into jch
commit40b1d6754f576dd4606954411a526a7637a97bd4
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:01 +0000 (21 11:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:01 +0000 (21 11:12 -0700)
tree2226199418d5940f54b0cc21c6bf852663ad9559
parentb5a8747809c080d95c8d51960f06658f913716b3
parentf7f91086a376ba53f8270ea80b7bbbd8274c3c2d
Merge branch 'jk/pack-shallow-always-without-bitmap' into jch

Reachability bitmaps do not work with shallow operations.

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