Merge branch 'jk/rev-list-count-with-bitmap' into maint
commitdf5a925523e627cd20ce11f570d418dfae2ac7d8
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:24 +0000 (27 09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:24 +0000 (27 09:56 -0700)
tree58760aa7f4f5bf9e05223aa9a73728f3892b5b5c
parentfbb4138cb2e6b77d1d8386f336e7813fcfd3cb02
parentfb85db84dcc36dcc3cdd5fc744280334bbe8eb47
Merge branch 'jk/rev-list-count-with-bitmap' into maint

"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"
builtin/rev-list.c