object_as_type: set commit index
The point of the "index" field of struct commit is that every allocated commit would have one. It is supposed to be an invariant that whenever object->type is set to OBJ_COMMIT, we have a unique index. Commit 969eba6 (commit: push commit_index update into alloc_commit_node, 2014-06-10) covered this case for newly-allocated commits. However, we may also allocate an "unknown" object via lookup_unknown_object, and only later convert it to a commit. We must make sure that we set the commit index when we switch the type field. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 13, 2014 at 02:42 UTC
d66bebcbcfa46d72bb5008e1d211c0ea87200d86
1 file changed
+2
object.c
+2
@@ -163,6 +163,8 @@ void *object_as_type(struct object *obj, enum object_type type, int quiet)
163
if (obj->type == type)
164
return obj;
165
else if (obj->type == OBJ_NONE) {
166
+ if (type == OBJ_COMMIT)
167
+ ((struct commit *)obj)->index = alloc_commit_index();
168
obj->type = type;
169
return obj;
170
}