diff options
| author |  Jeff King <peff@peff.net> | 2015-07-01 14:42:17 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-07-01 12:00:50 -0700 |
| commit | c8a70d35090c490ce0e9f1354ef372b2887bea28 (patch) | |
| tree | ce7496ef602855265f6980c6556cecd2bf8f0607 /builtin | |
| parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
| download | tgif-c8a70d35090c490ce0e9f1354ef372b2887bea28.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rev-list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ff84a825ff..88eddbd53a 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -355,7 +355,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (bisect_list) revs.limited = 1; - if (use_bitmap_index) { + if (use_bitmap_index && !revs.prune) { if (revs.count && !revs.left_right && !revs.cherry_mark) { uint32_t commit_count; if (!prepare_bitmap_walk(&revs)) { |