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

29
refs.c
View File

@ -1916,31 +1916,14 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags)
return refs->be->pack_refs(refs, flags);
}
int refs_peel_ref(struct ref_store *refs, const char *refname,
struct object_id *oid)
int peel_iterated_oid(const struct object_id *base, struct object_id *peeled)
{
int flag;
struct object_id base;
if (current_ref_iter &&
(current_ref_iter->oid == base ||
oideq(current_ref_iter->oid, base)))
return ref_iterator_peel(current_ref_iter, peeled);
if (current_ref_iter && current_ref_iter->refname == refname) {
struct object_id peeled;
if (ref_iterator_peel(current_ref_iter, &peeled))
return -1;
oidcpy(oid, &peeled);
return 0;
}
if (refs_read_ref_full(refs, refname,
RESOLVE_REF_READING, &base, &flag))
return -1;
return peel_object(&base, oid);
}
int peel_ref(const char *refname, struct object_id *oid)
{
return refs_peel_ref(get_main_ref_store(the_repository), refname, oid);
return peel_object(base, peeled);
}
int refs_create_symref(struct ref_store *refs,