odb: rename repo_read_object_file()
Rename `repo_read_object_file()` to `odb_read_object()` to match other functions related to the object database and our modern coding guidelines. Introduce a compatibility wrapper 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
e989dd96b8
commit
d4ff88aee3
@@ -63,7 +63,7 @@ static void *fill_tree_desc_strict(struct repository *r,
|
||||
enum object_type type;
|
||||
unsigned long size;
|
||||
|
||||
buffer = repo_read_object_file(r, hash, &type, &size);
|
||||
buffer = odb_read_object(r->objects, hash, &type, &size);
|
||||
if (!buffer)
|
||||
die("unable to read tree (%s)", oid_to_hex(hash));
|
||||
if (type != OBJ_TREE)
|
||||
@@ -199,7 +199,7 @@ static int splice_tree(struct repository *r,
|
||||
if (*subpath)
|
||||
subpath++;
|
||||
|
||||
buf = repo_read_object_file(r, oid1, &type, &sz);
|
||||
buf = odb_read_object(r->objects, oid1, &type, &sz);
|
||||
if (!buf)
|
||||
die("cannot read tree %s", oid_to_hex(oid1));
|
||||
init_tree_desc(&desc, oid1, buf, sz);
|
||||
|
||||
Reference in New Issue
Block a user