mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
odb: rename has_object()
Rename `has_object()` to `odb_has_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
d4ff88aee3
commit
fcf8e3e111
@@ -142,7 +142,7 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
|
||||
commit = lookup_commit_in_graph(the_repository, oid);
|
||||
if (commit) {
|
||||
if (mark_tags_complete_and_check_obj_db) {
|
||||
if (!has_object(the_repository, oid, 0))
|
||||
if (!odb_has_object(the_repository->objects, oid, 0))
|
||||
die_in_commit_graph_only(oid);
|
||||
}
|
||||
return commit;
|
||||
@@ -770,7 +770,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
|
||||
if (!commit) {
|
||||
struct object *o;
|
||||
|
||||
if (!has_object(the_repository, &ref->old_oid, 0))
|
||||
if (!odb_has_object(the_repository->objects, &ref->old_oid, 0))
|
||||
continue;
|
||||
o = parse_object(the_repository, &ref->old_oid);
|
||||
if (!o || o->type != OBJ_COMMIT)
|
||||
@@ -1984,8 +1984,8 @@ static void update_shallow(struct fetch_pack_args *args,
|
||||
struct oid_array extra = OID_ARRAY_INIT;
|
||||
struct object_id *oid = si->shallow->oid;
|
||||
for (i = 0; i < si->shallow->nr; i++)
|
||||
if (has_object(the_repository, &oid[i],
|
||||
HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
|
||||
if (odb_has_object(the_repository->objects, &oid[i],
|
||||
HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
|
||||
oid_array_append(&extra, &oid[i]);
|
||||
if (extra.nr) {
|
||||
setup_alternate_shallow(&shallow_lock,
|
||||
|
||||
Reference in New Issue
Block a user