зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
46931d3938
Коммит
a378509e1c
3
blob.c
3
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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));
|
||||
|
|
3
commit.c
3
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);
|
||||
}
|
||||
|
||||
|
|
6
object.c
6
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;
|
||||
}
|
||||
|
|
2
object.h
2
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);
|
||||
|
||||
|
|
3
tag.c
3
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);
|
||||
}
|
||||
|
||||
|
|
3
tree.c
3
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);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче