mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
odb: rename oid_object_info()
Rename `oid_object_info()` to `odb_read_object_info()` as well as their `_extended()` variant to match other functions related to the object database and our modern coding guidelines. Introduce compatibility wrappers so that any in-flight topics will continue to compile. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
16cf749496
commit
e989dd96b8
6
object.c
6
object.c
@@ -214,7 +214,7 @@ enum peel_status peel_object(struct repository *r,
|
||||
struct object *o = lookup_unknown_object(r, name);
|
||||
|
||||
if (o->type == OBJ_NONE) {
|
||||
int type = oid_object_info(r, name, NULL);
|
||||
int type = odb_read_object_info(r->objects, name, NULL);
|
||||
if (type < 0 || !object_as_type(o, type, 0))
|
||||
return PEEL_INVALID;
|
||||
}
|
||||
@@ -315,7 +315,7 @@ struct object *parse_object_with_flags(struct repository *r,
|
||||
}
|
||||
|
||||
if ((!obj || obj->type == OBJ_BLOB) &&
|
||||
oid_object_info(r, oid, NULL) == OBJ_BLOB) {
|
||||
odb_read_object_info(r->objects, oid, NULL) == OBJ_BLOB) {
|
||||
if (!skip_hash && stream_object_signature(r, repl) < 0) {
|
||||
error(_("hash mismatch %s"), oid_to_hex(oid));
|
||||
return NULL;
|
||||
@@ -331,7 +331,7 @@ struct object *parse_object_with_flags(struct repository *r,
|
||||
*/
|
||||
if (skip_hash && discard_tree &&
|
||||
(!obj || obj->type == OBJ_TREE) &&
|
||||
oid_object_info(r, oid, NULL) == OBJ_TREE) {
|
||||
odb_read_object_info(r->objects, oid, NULL) == OBJ_TREE) {
|
||||
return &lookup_tree(r, oid)->object;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user