diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:24 -0700 |
| commit | df5a925523e627cd20ce11f570d418dfae2ac7d8 (patch) | |
| tree | 58760aa7f4f5bf9e05223aa9a73728f3892b5b5c /builtin | |
| parent | Merge branch 'et/pretty-format-c-auto' into maint (diff) | |
| parent | rev-list: disable bitmaps when "-n" is used with listing objects (diff) | |
| download | tgif-df5a925523e627cd20ce11f570d418dfae2ac7d8.tar.xz | |
Merge branch 'jk/rev-list-count-with-bitmap' into maint
"git rev-list --count" whose walk-length is limited with "-n"
option did not work well with the counting optimized to look at the
bitmap index.
* jk/rev-list-count-with-bitmap:
rev-list: disable bitmaps when "-n" is used with listing objects
rev-list: "adjust" results of "--count --use-bitmap-index -n"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rev-list.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 275da0d647..b82bcc3436 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -358,12 +358,16 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (use_bitmap_index && !revs.prune) { if (revs.count && !revs.left_right && !revs.cherry_mark) { uint32_t commit_count; + int max_count = revs.max_count; if (!prepare_bitmap_walk(&revs)) { count_bitmap_commit_list(&commit_count, NULL, NULL, NULL); + if (max_count >= 0 && max_count < commit_count) + commit_count = max_count; printf("%d\n", commit_count); return 0; } - } else if (revs.tag_objects && revs.tree_objects && revs.blob_objects) { + } else if (revs.max_count < 0 && + revs.tag_objects && revs.tree_objects && revs.blob_objects) { if (!prepare_bitmap_walk(&revs)) { traverse_bitmap_commit_list(&show_object_fast); return 0; |