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)
commit6d8c5454b6f29568cd4ed231160f82c9579fe1f2
tree5c4b22af79f0fca61163396da277293b8519d3ec
parent8699b74ae1190b90facdbe83a879251c8a9e07ac
parentfb85db84dcc36dcc3cdd5fc744280334bbe8eb47
Merge branch 'jk/rev-list-count-with-bitmap'

"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