object: convert create_object() to use object_id

peff · gitster · commit a378509e1c8d · 2019-06-20T10:20:51.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/blob.c b/blob.c
@@ -9,8 +9,7 @@ struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
 {
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
-		return create_object(r, oid->hash,
-				     alloc_blob_node(r));
+		return create_object(r, oid, alloc_blob_node(r));
 	return object_as_type(r, obj, OBJ_BLOB, 0);
 }
 
diff --git a/commit-graph.c b/commit-graph.c
@@ -1214,7 +1214,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g)
 		hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
 
 		graph_commit = lookup_commit(r, &cur_oid);
-		odb_commit = (struct commit *)create_object(r, cur_oid.hash, alloc_commit_node(r));
+		odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r));
 		if (parse_commit_internal(odb_commit, 0, 0)) {
 			graph_report(_("failed to parse commit %s from object database for commit-graph"),
 				     oid_to_hex(&cur_oid));
diff --git a/commit.c b/commit.c
@@ -59,8 +59,7 @@ struct commit *lookup_commit(struct repository *r, const struct object_id *oid)
 {
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
-		return create_object(r, oid->hash,
-				     alloc_commit_node(r));
+		return create_object(r, oid, alloc_commit_node(r));
 	return object_as_type(r, obj, OBJ_COMMIT, 0);
 }
 
diff --git 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;
 }
diff --git a/object.h b/object.h
@@ -118,7 +118,7 @@ struct object *get_indexed_object(unsigned int);
  */
 struct object *lookup_object(struct repository *r, const struct object_id *oid);
 
-void *create_object(struct repository *r, const unsigned char *sha1, void *obj);
+void *create_object(struct repository *r, const struct object_id *oid, void *obj);
 
 void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet);
 
diff --git a/tag.c b/tag.c
@@ -102,8 +102,7 @@ struct tag *lookup_tag(struct repository *r, const struct object_id *oid)
 {
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
-		return create_object(r, oid->hash,
-				     alloc_tag_node(r));
+		return create_object(r, oid, alloc_tag_node(r));
 	return object_as_type(r, obj, OBJ_TAG, 0);
 }
 
diff --git a/tree.c b/tree.c
@@ -199,8 +199,7 @@ struct tree *lookup_tree(struct repository *r, const struct object_id *oid)
 {
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
-		return create_object(r, oid->hash,
-				     alloc_tree_node(r));
+		return create_object(r, oid, alloc_tree_node(r));
 	return object_as_type(r, obj, OBJ_TREE, 0);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ struct blob lookup_blob(struct repository r, const struct object_id *oid)`
`9`	`9`	`{`
`10`	`10`	`struct object *obj = lookup_object(r, oid);`
`11`	`11`	`if (!obj)`
`12`		`- return create_object(r, oid->hash,`
`13`		`- alloc_blob_node(r));`
	`12`	`+ return create_object(r, oid, alloc_blob_node(r));`
`14`	`13`	`return object_as_type(r, obj, OBJ_BLOB, 0);`
`15`	`14`	`}`
`16`	`15`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ struct commit lookup_commit(struct repository r, const struct object_id *oid)`
`59`	`59`	`{`
`60`	`60`	`struct object *obj = lookup_object(r, oid);`
`61`	`61`	`if (!obj)`
`62`		`- return create_object(r, oid->hash,`
`63`		`- alloc_commit_node(r));`
	`62`	`+ return create_object(r, oid, alloc_commit_node(r));`
`64`	`63`	`return object_as_type(r, obj, OBJ_COMMIT, 0);`
`65`	`64`	`}`
`66`	`65`
Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,13 @@ static void grow_object_hash(struct repository *r)`
`141`	`141`	`r->parsed_objects->obj_hash_size = new_hash_size;`
`142`	`142`	`}`
`143`	`143`
`144`		`-void create_object(struct repository r, const unsigned char sha1, void o)`
	`144`	`+void create_object(struct repository r, const struct object_id oid, void o)`
`145`	`145`	`{`
`146`	`146`	`struct object *obj = o;`
`147`	`147`
`148`	`148`	`obj->parsed = 0;`
`149`	`149`	`obj->flags = 0;`
`150`		`- hashcpy(obj->oid.hash, sha1);`
	`150`	`+ oidcpy(&obj->oid, oid);`
`151`	`151`
`152`	`152`	`if (r->parsed_objects->obj_hash_size - 1 <= r->parsed_objects->nr_objs * 2)`
`153`	`153`	`grow_object_hash(r);`
`@@ -182,7 +182,7 @@ struct object lookup_unknown_object(const struct object_id oid)`
`182`	`182`	`{`
`183`	`183`	`struct object *obj = lookup_object(the_repository, oid);`
`184`	`184`	`if (!obj)`
`185`		`- obj = create_object(the_repository, oid->hash,`
	`185`	`+ obj = create_object(the_repository, oid,`
`186`	`186`	`alloc_object_node(the_repository));`
`187`	`187`	`return obj;`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,7 @@ struct tag lookup_tag(struct repository r, const struct object_id *oid)`
`102`	`102`	`{`
`103`	`103`	`struct object *obj = lookup_object(r, oid);`
`104`	`104`	`if (!obj)`
`105`		`- return create_object(r, oid->hash,`
`106`		`- alloc_tag_node(r));`
	`105`	`+ return create_object(r, oid, alloc_tag_node(r));`
`107`	`106`	`return object_as_type(r, obj, OBJ_TAG, 0);`
`108`	`107`	`}`
`109`	`108`
Original file line number	Diff line number	Diff line change
`@@ -199,8 +199,7 @@ struct tree lookup_tree(struct repository r, const struct object_id *oid)`
`199`	`199`	`{`
`200`	`200`	`struct object *obj = lookup_object(r, oid);`
`201`	`201`	`if (!obj)`
`202`		`- return create_object(r, oid->hash,`
`203`		`- alloc_tree_node(r));`
	`202`	`+ return create_object(r, oid, alloc_tree_node(r));`
`204`	`203`	`return object_as_type(r, obj, OBJ_TREE, 0);`
`205`	`204`	`}`
`206`	`205`