diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-09-25 10:00:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 18:02:45 +0900 |
| commit | 81b9b5aea7094cdef110c4ae91d9cc601510fe8b (patch) | |
| tree | 4aad8a5bf213879f5a16c1a221e907a1f9e1c769 /refs | |
| parent | 9cfb3dc0d12a1db12c43edaa5e2545a6818ecc95 (diff) | |
| download | git-81b9b5aea7094cdef110c4ae91d9cc601510fe8b.tar.gz git-81b9b5aea7094cdef110c4ae91d9cc601510fe8b.tar.xz | |
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>
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/packed-backend.c | 10 |
1 files changed, 8 insertions, 2 deletions
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); } |