diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 19:21:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 19:21:42 (GMT) |
| commit | 726359be47b194c692990d3047d23ac56142a220 (patch) | |
| tree | c2d653b1558fe2bda48ef45ecd57a638bbdbbfa2 /builtin | |
| parent | aa0b816c5dd3f9a56f4b8a27d1e7112a98108b91 (diff) | |
| parent | c8a70d35090c490ce0e9f1354ef372b2887bea28 (diff) | |
| download | git-726359be47b194c692990d3047d23ac56142a220.zip git-726359be47b194c692990d3047d23ac56142a220.tar.gz git-726359be47b194c692990d3047d23ac56142a220.tar.bz2 | |
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 '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 ff84a82..88eddbd 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)) { |