diff options
| author | Matthew DeVore <matvore@google.com> | 2019-01-09 02:59:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-15 23:39:34 (GMT) |
| commit | 8272f26034c9dbaf5cd216a137b8e91241cbc24e (patch) | |
| tree | c18266c09529e4248b10a2587da1b83cbccc7207 /list-objects-filter.c | |
| parent | c813a7c35f44f4bf435c6ecb21bf4b9ec8f227de (diff) | |
| download | git-8272f26034c9dbaf5cd216a137b8e91241cbc24e.zip git-8272f26034c9dbaf5cd216a137b8e91241cbc24e.tar.gz git-8272f26034c9dbaf5cd216a137b8e91241cbc24e.tar.bz2 | |
tree:<depth>: skip some trees even when collecting omits
If a tree has already been recorded as omitted, we don't need to
traverse it again just to collect its omits. Stop traversing trees a
second time when collecting omits.
Signed-off-by: Matthew DeVore <matvore@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'list-objects-filter.c')
| -rw-r--r-- | list-objects-filter.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/list-objects-filter.c b/list-objects-filter.c index 786e0dd..ee449de 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -107,18 +107,19 @@ struct seen_map_entry { size_t depth; }; -static void filter_trees_update_omits( +/* Returns 1 if the oid was in the omits set before it was invoked. */ +static int filter_trees_update_omits( struct object *obj, struct filter_trees_depth_data *filter_data, int include_it) { if (!filter_data->omits) - return; + return 0; if (include_it) - oidset_remove(filter_data->omits, &obj->oid); + return oidset_remove(filter_data->omits, &obj->oid); else - oidset_insert(filter_data->omits, &obj->oid); + return oidset_insert(filter_data->omits, &obj->oid); } static enum list_objects_filter_result filter_trees_depth( @@ -171,12 +172,17 @@ static enum list_objects_filter_result filter_trees_depth( if (already_seen) { filter_res = LOFR_SKIP_TREE; } else { + int been_omitted = filter_trees_update_omits( + obj, filter_data, include_it); seen_info->depth = filter_data->current_depth; - filter_trees_update_omits(obj, filter_data, include_it); if (include_it) filter_res = LOFR_DO_SHOW; - else if (filter_data->omits) + else if (filter_data->omits && !been_omitted) + /* + * Must update omit information of children + * recursively; they have not been omitted yet. + */ filter_res = LOFR_ZERO; else filter_res = LOFR_SKIP_TREE; |