mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
rev-list: disable --use-bitmap-index when pruning commits
The reachability bitmaps do not have enough information to tell us which commits might have changed path "foo", so the current code produces wrong answers for: git rev-list --use-bitmap-index --count HEAD -- foo (it silently ignores the "foo" limiter). Instead, we should fall back to doing a normal traversal (it is OK to fall back rather than complain, because --use-bitmap-index is a pure optimization, and might not kick in for other reasons, such as there being no bitmaps in the repository). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
282616c72d
commit
c8a70d3509
|
@ -355,7 +355,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
||||||
if (bisect_list)
|
if (bisect_list)
|
||||||
revs.limited = 1;
|
revs.limited = 1;
|
||||||
|
|
||||||
if (use_bitmap_index) {
|
if (use_bitmap_index && !revs.prune) {
|
||||||
if (revs.count && !revs.left_right && !revs.cherry_mark) {
|
if (revs.count && !revs.left_right && !revs.cherry_mark) {
|
||||||
uint32_t commit_count;
|
uint32_t commit_count;
|
||||||
if (!prepare_bitmap_walk(&revs)) {
|
if (!prepare_bitmap_walk(&revs)) {
|
||||||
|
|
|
@ -53,6 +53,12 @@ rev_list_tests() {
|
||||||
test_cmp expect actual
|
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)" '
|
test_expect_success "enumerate --objects ($state)" '
|
||||||
git rev-list --objects --use-bitmap-index HEAD >tmp &&
|
git rev-list --objects --use-bitmap-index HEAD >tmp &&
|
||||||
cut -d" " -f1 <tmp >tmp2 &&
|
cut -d" " -f1 <tmp >tmp2 &&
|
||||||
|
|
Loading…
Reference in a new issue