diff options
| author |  Jeff King <peff@peff.net> | 2020-02-14 13:22:20 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 10:46:22 -0800 |
| commit | 55cb10f9b5cd7216652a5879b792bcd7ac173035 (patch) | |
| tree | 2b8cf0ac838c177bc8c16ecc596d0d03ef3936e4 /builtin/rev-list.c | |
| parent | rev-list: factor out bitmap-optimized routines (diff) | |
| download | tgif-55cb10f9b5cd7216652a5879b792bcd7ac173035.tar.xz | |
rev-list: make --count work with --objects
The current behavior from "rev-list --count --objects" is nonsensical:
we enumerate all of the objects except commits, but then give a count of
commits. This wasn't planned, and is just what the code happens to do.
Instead, let's give the answer the user almost certainly wanted: the
full count of objects.
Note that there are more complicated cases around cherry-marking, etc.
We'll punt on those for now, but let the user know that we can't produce
an answer (rather than giving them something useless).
We'll test both the new feature as well as a vanilla --count of commits,
since that surprisingly doesn't seem to be covered in the existing
tests.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 38c5ca5603..9452123988 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -253,11 +253,19 @@ static int finish_object(struct object *obj, const char *name, void *cb_data) static void show_object(struct object *obj, const char *name, void *cb_data) { struct rev_list_info *info = cb_data; + struct rev_info *revs = info->revs; + if (finish_object(obj, name, cb_data)) return; display_progress(progress, ++progress_counter); if (info->flags & REV_LIST_QUIET) return; + + if (revs->count) { + revs->count_right++; + return; + } + if (arg_show_object_names) show_object_with_name(stdout, obj, name); else @@ -584,6 +592,11 @@ 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 (revs.count && + (revs.tag_objects || revs.tree_objects || revs.blob_objects) && + (revs.left_right || revs.cherry_mark)) + die(_("marked counting is incompatible with --objects")); + if (filter_options.choice) use_bitmap_index = 0; |