From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 25 Sep 2017 08:00:08 +0000 (+0200)
Subject: mmapped_ref_iterator_advance(): no peeled value for broken refs
X-Git-Tag: v2.15.0-rc0~13^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=81b9b5aea7094cdef110c4ae91d9cc601510fe8b;p=git-core%2Fgit.git

mmapped_ref_iterator_advance(): no peeled value for broken refs

If a reference is broken, suppress its peeled value.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 312116a99..724c88631 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);
 	}