Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
mmapped_ref_iterator_advance(): no peeled value for broken refs
author
Michael Haggerty
<mhagger@alum.mit.edu>
Mon, 25 Sep 2017 08:00:08 +0000
(10:00 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 25 Sep 2017 09:02:45 +0000
(18:02 +0900)
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>
refs/packed-backend.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9cfb3dc
)
diff --git
a/refs/packed-backend.c
b/refs/packed-backend.c
index 312116a99dba3029906c40388ce5ef7e79aa914d..724c88631d92e0f4f56206395922f791bc120edc 100644
(file)
--- 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);
}