mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/peel-iterated-oid'

Browse Source 
The peel_ref() API has been replaced with peel_iterated_oid().

* jk/peel-iterated-oid:
  refs: switch peel_ref() to peel_iterated_oid()
This commit is contained in:
Junio C Hamano
2021-02-03 15:04:49 -08:00
parent 6cd7f9dc29 36a317929b
commit 973e20b83f
12 changed files with 26 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/pack-objects.c
View File

@ -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;