From: Jeff King <peff@peff.net>
To: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH 6/7] object_as_type: set commit index
Date: Fri, 11 Jul 2014 04:49:42 -0400 [thread overview]
Message-ID: <20140711084942.GF5625@sigill.intra.peff.net> (raw)
In-Reply-To: <20140711084141.GA5521@sigill.intra.peff.net>
The point of the "index" field of struct commit is that
every allocated commit would have a uniquely allocated
value. 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
OBJ_NONE 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>
---
object.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/object.c b/object.c
index b2319f6..69fbbbf 100644
--- a/object.c
+++ b/object.c
@@ -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;
}
--
2.0.0.566.gfe3e6b2
next prev parent reply other threads:[~2014-07-11 8:49 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 23:59 [PATCH v3 2/2] alloc.c: remove the redundant commit_count variable Ramsay Jones
2014-07-11 0:30 ` Jeff King
2014-07-11 0:59 ` Ramsay Jones
2014-07-11 8:32 ` Jeff King
2014-07-11 9:41 ` Ramsay Jones
2014-07-11 8:41 ` [PATCH 0/7] ensure index is set for all OBJ_COMMIT objects variable Jeff King
2014-07-11 8:42 ` [PATCH 1/7] alloc.c: remove the alloc_raw_commit_node() function Jeff King
2014-07-11 8:46 ` [PATCH 2/7] move setting of object->type to alloc_* functions Jeff King
2014-07-12 14:44 ` Ramsay Jones
2014-07-12 18:05 ` Jeff King
2014-07-13 6:41 ` Jeff King
2014-07-13 6:41 ` [PATCH v2 1/8] alloc.c: remove the alloc_raw_commit_node() function Jeff King
2014-07-15 20:06 ` Junio C Hamano
2014-07-13 6:41 ` [PATCH v2 2/8] alloc: write out allocator definitions Jeff King
2014-07-15 20:11 ` Junio C Hamano
2014-07-13 6:41 ` [PATCH v2 3/8] move setting of object->type to alloc_* functions Jeff King
2014-07-15 20:12 ` Junio C Hamano
2014-07-13 6:42 ` [PATCH v2 4/8] parse_object_buffer: do not set object type Jeff King
2014-07-13 6:42 ` [PATCH v2 5/8] add object_as_type helper for casting objects Jeff King
2014-07-13 6:42 ` [PATCH v2 6/8] alloc: factor out commit index Jeff King
2014-07-13 6:42 ` [PATCH v2 7/8] object_as_type: set " Jeff King
2014-07-13 6:42 ` [PATCH v2 8/8] diff-tree: avoid lookup_unknown_object Jeff King
2014-07-13 19:27 ` [PATCH 2/7] move setting of object->type to alloc_* functions Ramsay Jones
2014-07-14 5:57 ` Jeff King
2014-07-14 11:03 ` Ramsay Jones
2014-07-12 14:55 ` Ramsay Jones
2014-07-12 18:07 ` Jeff King
2014-07-11 8:46 ` [PATCH 3/7] parse_object_buffer: do not set object type Jeff King
2014-07-11 8:48 ` [PATCH 4/7] add object_as_type helper for casting objects Jeff King
2014-07-11 10:45 ` Ramsay Jones
2014-07-11 16:59 ` Jeff King
2014-07-11 8:48 ` [PATCH 5/7] alloc: factor out commit index Jeff King
2014-07-11 8:49 ` Jeff King [this message]
2014-07-11 8:50 ` [PATCH 7/7] diff-tree: avoid lookup_unknown_object Jeff King
2014-07-11 10:31 ` [PATCH 0/7] ensure index is set for all OBJ_COMMIT objects variable Ramsay Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140711084942.GF5625@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ramsay@ramsay1.demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).