]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'jk/pack-shallow-always-without-bitmap'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (11:16 -0700)
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

1  2 
builtin/pack-objects.c

Simple merge