diff options
author | Jeff King <peff@peff.net> | 2014-07-13 02:42:12 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-28 10:14:34 -0700 |
commit | 34dfe197a93763ec9c5d25eec499777cbb32b6fd (patch) | |
tree | 0190bf174c73be8db13e1b127f817c6b1f1520b8 | |
parent | alloc: factor out commit index (diff) | |
download | tgif-34dfe197a93763ec9c5d25eec499777cbb32b6fd.tar.xz |
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>
-rw-r--r-- | object.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -163,6 +163,8 @@ void *object_as_type(struct object *obj, enum object_type type, int quiet) if (obj->type == type) return obj; else if (obj->type == OBJ_NONE) { + if (type == OBJ_COMMIT) + ((struct commit *)obj)->index = alloc_commit_index(); obj->type = type; return obj; } |