[PATCH 04/13] rev-list: consolidate bitmap-disabling options
- From
Jeff King <peff@peff.net>
- Date
- Feb 13, 2020, 02:17 UTC
- Message-ID
- <20200213021749.GD1126038@coredump.intra.peff.net>
- In-Reply-To
- <20200213021506.GA1124607@coredump.intra.peff.net>
A few options are incompatible with bitmaps, like --filter or pathspec-based pruning. Let's put these checks all up front, so that further code can trust the use_bitmap_index as the final word.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/rev-list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index bce406bd1e..9635b544e3 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -521,7 +521,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (revs.show_notes) die(_("rev-list does not support display of notes")); - if (filter_options.choice) + if (filter_options.choice || revs.prune) use_bitmap_index = 0; save_commit_buffer = (revs.verbose_header || @@ -533,7 +533,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (show_progress) progress = start_delayed_progress(show_progress, 0); - if (use_bitmap_index && !revs.prune) { + if (use_bitmap_index) { if (revs.count && !revs.left_right && !revs.cherry_mark) { uint32_t commit_count; int max_count = revs.max_count;
-- 2.25.0.785.g49bcbe7794