diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-03 15:04:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-03 15:04:49 -0800 |
| commit | 973e20b83f38d0a640d4e0478ddbd50dfa98daf1 (patch) | |
| tree | 6cf89c7e061f25e00153b64af2dc1736c98337f9 /builtin/pack-objects.c | |
| parent | Merge branch 'js/skip-dashed-built-ins-from-config-mak' (diff) | |
| parent | refs: switch peel_ref() to peel_iterated_oid() (diff) | |
| download | tgif-973e20b83f38d0a640d4e0478ddbd50dfa98daf1.tar.xz | |
Merge branch 'jk/peel-iterated-oid'
The peel_ref() API has been replaced with peel_iterated_oid().
* jk/peel-iterated-oid:
refs: switch peel_ref() to peel_iterated_oid()
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 5b0c4489e2..57f0bc28b8 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -634,7 +634,7 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag, if (entry) entry->tagged = 1; - if (!peel_ref(path, &peeled)) { + if (!peel_iterated_oid(oid, &peeled)) { entry = packlist_find(&to_pack, &peeled); if (entry) entry->tagged = 1; @@ -2819,7 +2819,7 @@ static int add_ref_tag(const char *path, const struct object_id *oid, int flag, struct object_id peeled; if (starts_with(path, "refs/tags/") && /* is a tag? */ - !peel_ref(path, &peeled) && /* peelable? */ + !peel_iterated_oid(oid, &peeled) && /* peelable? */ obj_is_packed(&peeled)) /* object packed? */ add_tag_chain(oid); return 0; |