diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:03 -0700 |
| commit | 6d8c5454b6f29568cd4ed231160f82c9579fe1f2 (patch) | |
| tree | 5c4b22af79f0fca61163396da277293b8519d3ec /t | |
| parent | Merge branch 'wd/userdiff-css' (diff) | |
| parent | rev-list: disable bitmaps when "-n" is used with listing objects (diff) | |
| download | tgif-6d8c5454b6f29568cd4ed231160f82c9579fe1f2.tar.xz | |
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"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5310-pack-bitmaps.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index d446706e94..3893afd687 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -47,6 +47,12 @@ rev_list_tests() { test_cmp expect actual ' + test_expect_success "counting commits with limit ($state)" ' + git rev-list --count -n 1 HEAD >expect && + git rev-list --use-bitmap-index --count -n 1 HEAD >actual && + test_cmp expect actual + ' + test_expect_success "counting non-linear history ($state)" ' git rev-list --count other...master >expect && git rev-list --use-bitmap-index --count other...master >actual && |