aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:42 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:42 -0700
commit726359be47b194c692990d3047d23ac56142a220 (patch)
treec2d653b1558fe2bda48ef45ecd57a638bbdbbfa2 /t
parentaa0b816c5dd3f9a56f4b8a27d1e7112a98108b91 (diff)
parentc8a70d35090c490ce0e9f1354ef372b2887bea28 (diff)
downloadgit-726359be47b194c692990d3047d23ac56142a220.tar.gz
git-726359be47b194c692990d3047d23ac56142a220.tar.xz
Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint
A minor bugfix when pack bitmap is used with "rev-list --count". * jk/rev-list-no-bitmap-while-pruning: rev-list: disable --use-bitmap-index when pruning commits
Diffstat (limited to 't')
-rwxr-xr-xt/t5310-pack-bitmaps.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 600349019..d446706e9 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -53,6 +53,12 @@ rev_list_tests() {
test_cmp expect actual
'
+ test_expect_success "counting commits with limiting ($state)" '
+ git rev-list --count HEAD -- 1.t >expect &&
+ git rev-list --use-bitmap-index --count HEAD -- 1.t >actual &&
+ test_cmp expect actual
+ '
+
test_expect_success "enumerate --objects ($state)" '
git rev-list --objects --use-bitmap-index HEAD >tmp &&
cut -d" " -f1 <tmp >tmp2 &&