Merge branch 'jk/rev-list-count-with-bitmap'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:03 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:03 +0000 (11:01 -0700)
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.

* jk/rev-list-count-with-bitmap:
  rev-list: disable bitmaps when "-n" is used with listing objects
  rev-list: "adjust" results of "--count --use-bitmap-index -n"

1  2 
builtin/rev-list.c

Simple merge