From 81b9b5aea7094cdef110c4ae91d9cc601510fe8b Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 Sep 2017 10:00:08 +0200 Subject: [PATCH] mmapped_ref_iterator_advance(): no peeled value for broken refs If a reference is broken, suppress its peeled value. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- refs/packed-backend.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 312116a99d..724c88631d 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -234,9 +234,15 @@ static int mmapped_ref_iterator_advance(struct ref_iterator *ref_iterator) /* * Regardless of what the file header said, we - * definitely know the value of *this* reference: + * definitely know the value of *this* reference. But + * we suppress it if the reference is broken: */ - iter->base.flags |= REF_KNOWS_PEELED; + if ((iter->base.flags & REF_ISBROKEN)) { + oidclr(&iter->peeled); + iter->base.flags &= ~REF_KNOWS_PEELED; + } else { + iter->base.flags |= REF_KNOWS_PEELED; + } } else { oidclr(&iter->peeled); }