diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:49 -0700 |
| commit | f0ade787acb2c94f2cbf4b4b169818166315210f (patch) | |
| tree | 78001988e65e7efd75c1d641f46e51af6db76cc2 /refs | |
| parent | Merge branch 'ab/mktag-tests' (diff) | |
| parent | refs: make explicit that ref_iterator_peel returns boolean (diff) | |
| download | tgif-f0ade787acb2c94f2cbf4b4b169818166315210f.tar.xz | |
Merge branch 'hn/refs-iterator-peel-returns-boolean'
Tiny API tweak.
* hn/refs-iterator-peel-returns-boolean:
refs: make explicit that ref_iterator_peel returns boolean
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/packed-backend.c | 2 | ||||
| -rw-r--r-- | refs/ref-cache.c | 2 | ||||
| -rw-r--r-- | refs/refs-internal.h | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/refs/packed-backend.c b/refs/packed-backend.c index dfecdbc1db..66cb90c79e 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -889,7 +889,7 @@ static int packed_ref_iterator_peel(struct ref_iterator *ref_iterator, } else if ((iter->base.flags & (REF_ISBROKEN | REF_ISSYMREF))) { return -1; } else { - return !!peel_object(&iter->oid, peeled); + return peel_object(&iter->oid, peeled) ? -1 : 0; } } diff --git a/refs/ref-cache.c b/refs/ref-cache.c index 46f1e54284..49d732f6db 100644 --- a/refs/ref-cache.c +++ b/refs/ref-cache.c @@ -491,7 +491,7 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator) static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator, struct object_id *peeled) { - return peel_object(ref_iterator->oid, peeled); + return peel_object(ref_iterator->oid, peeled) ? -1 : 0; } static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator) diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 467f4b3c93..3155708345 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -453,6 +453,9 @@ void base_ref_iterator_free(struct ref_iterator *iter); */ typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator); +/* + * Peels the current ref, returning 0 for success or -1 for failure. + */ typedef int ref_iterator_peel_fn(struct ref_iterator *ref_iterator, struct object_id *peeled); |