Merge branch 'jk/pack-shallow-always-without-bitmap' into next
commite04c9351167db4883e0d8c6889cb40fea63666ec
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 19:07:37 +0000 (21 12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 19:07:37 +0000 (21 12:07 -0700)
tree649dd9f8f168438b27a5032411a8e803d4f4ecf8
parentb282021141637c6f4bbfcd570b798f13174a8703
parentf7f91086a376ba53f8270ea80b7bbbd8274c3c2d
Merge branch 'jk/pack-shallow-always-without-bitmap' into next

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