diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-06 03:40:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-06 03:40:45 +0300 |
| commit | 77db59c2f91de69d5b204b88422d01b2632bcecd (patch) | |
| tree | ebc9ddc33fd30dfd0e76c4176d24cb7915d23268 /builtin | |
| parent | f6ef8baba293f851b07192169f40004ce44a74c1 (diff) | |
| parent | be18153b975844f8792b03e337f1a4c86fe87531 (diff) | |
Merge branch 'jv/pack-objects-narrower-ref-iteration'
The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
* jv/pack-objects-narrower-ref-iteration:
builtin/pack-objects.c: avoid iterating all refs
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 57f0bc28b8..13cde5896a 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2814,13 +2814,11 @@ static void add_tag_chain(const struct object_id *oid) } } -static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data) +static int add_ref_tag(const char *tag, const struct object_id *oid, int flag, void *cb_data) { struct object_id peeled; - if (starts_with(path, "refs/tags/") && /* is a tag? */ - !peel_iterated_oid(oid, &peeled) && /* peelable? */ - obj_is_packed(&peeled)) /* object packed? */ + if (!peel_iterated_oid(oid, &peeled) && obj_is_packed(&peeled)) add_tag_chain(oid); return 0; } @@ -3751,7 +3749,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) } cleanup_preferred_base(); if (include_tag && nr_result) - for_each_ref(add_ref_tag, NULL); + for_each_tag_ref(add_ref_tag, NULL); stop_progress(&progress_state); trace2_region_leave("pack-objects", "enumerate-objects", the_repository); |