summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorAbhishek Kumar <abhishekkumar8222@gmail.com>2020-06-17 09:14:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-06-17 21:37:14 (GMT)
commit6da43d937ca96d277556fa92c5a664fb1cbcc8ac (patch)
treece884f3ed784156350127e7fcb2bddcf49ef905a /object.c
parenteebb51ba8cab97c0b3f3f18eaab7796803b8494b (diff)
downloadgit-6da43d937ca96d277556fa92c5a664fb1cbcc8ac.zip
git-6da43d937ca96d277556fa92c5a664fb1cbcc8ac.tar.gz
git-6da43d937ca96d277556fa92c5a664fb1cbcc8ac.tar.bz2
object: drop parsed_object_pool->commit_count
14ba97f8 (alloc: allow arbitrary repositories for alloc functions, 2018-05-15) introduced parsed_object_pool->commit_count to keep count of commits per repository and was used to assign commit->index. However, commit-slab code requires commit->index values to be unique and a global count would be correct, rather than a per-repo count. Let's introduce a static counter variable, `parsed_commits_count` to keep track of parsed commits so far. As commit_count has no use anymore, let's also drop it from the struct. Signed-off-by: Abhishek Kumar <abhishekkumar8222@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.c')
-rw-r--r--object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/object.c b/object.c
index 794c866..3257518 100644
--- a/object.c
+++ b/object.c
@@ -157,13 +157,13 @@ void *create_object(struct repository *r, const struct object_id *oid, void *o)
return obj;
}
-void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet)
+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)
- init_commit_node(r, (struct commit *) obj);
+ init_commit_node((struct commit *) obj);
else
obj->type = type;
return obj;