summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-06-20 07:41:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-20 17:20:51 (GMT)
commita378509e1c8d817b3abe42bd8b3c8aa2a6f9af8a (patch)
treec22ee3fa74a81b5465535b3eb6aa9f1d90b0c692 /object.c
parent46931d39389f2886e6c159674923345f024e1c64 (diff)
downloadgit-a378509e1c8d817b3abe42bd8b3c8aa2a6f9af8a.zip
git-a378509e1c8d817b3abe42bd8b3c8aa2a6f9af8a.tar.gz
git-a378509e1c8d817b3abe42bd8b3c8aa2a6f9af8a.tar.bz2
object: convert create_object() to use object_id
There are no callers left of create_object() that aren't just passing us the "hash" member of a "struct object_id". Let's take the whole struct, which gets us closer to removing all raw sha1 variables. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.c')
-rw-r--r--object.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/object.c b/object.c
index dbfdbe5..317647d 100644
--- a/object.c
+++ b/object.c
@@ -141,13 +141,13 @@ static void grow_object_hash(struct repository *r)
r->parsed_objects->obj_hash_size = new_hash_size;
}
-void *create_object(struct repository *r, const unsigned char *sha1, void *o)
+void *create_object(struct repository *r, const struct object_id *oid, void *o)
{
struct object *obj = o;
obj->parsed = 0;
obj->flags = 0;
- hashcpy(obj->oid.hash, sha1);
+ oidcpy(&obj->oid, oid);
if (r->parsed_objects->obj_hash_size - 1 <= r->parsed_objects->nr_objs * 2)
grow_object_hash(r);
@@ -182,7 +182,7 @@ struct object *lookup_unknown_object(const struct object_id *oid)
{
struct object *obj = lookup_object(the_repository, oid);
if (!obj)
- obj = create_object(the_repository, oid->hash,
+ obj = create_object(the_repository, oid,
alloc_object_node(the_repository));
return obj;
}