diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:34 -0700 |
| commit | 88ad76ca8920153e4ae3d56b14926d97271ffc0d (patch) | |
| tree | 112adaecf840975a4443438f221e6b55c06a80da /builtin/pack-objects.c | |
| parent | Merge branch 'ag/doc-sendmail-gmail-example-update' into maint-2.51 (diff) | |
| parent | odb: drop deprecated wrapper functions (diff) | |
| download | git-88ad76ca8920153e4ae3d56b14926d97271ffc0d.tar.gz git-88ad76ca8920153e4ae3d56b14926d97271ffc0d.zip | |
Merge branch 'ps/odb-clean-stale-wrappers' into maint-2.51
Code clean-up.
* ps/odb-clean-stale-wrappers:
odb: drop deprecated wrapper functions
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 53a2256250..ff6900b654 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3774,7 +3774,7 @@ static void show_object_pack_hint(struct object *object, const char *name, enum stdin_packs_mode mode = *(enum stdin_packs_mode *)data; if (mode == STDIN_PACKS_MODE_FOLLOW) { if (object->type == OBJ_BLOB && - !has_object(the_repository, &object->oid, 0)) + !odb_has_object(the_repository->objects, &object->oid, 0)) return; add_object_entry(&object->oid, object->type, name, 0); } else { @@ -4591,8 +4591,8 @@ static int add_objects_by_path(const char *path, /* Skip objects that do not exist locally. */ if ((exclude_promisor_objects || arg_missing_action != MA_ERROR) && - oid_object_info_extended(the_repository, oid, &oi, - OBJECT_INFO_FOR_PREFETCH) < 0) + odb_read_object_info_extended(the_repository->objects, oid, &oi, + OBJECT_INFO_FOR_PREFETCH) < 0) continue; exclude = is_oid_uninteresting(the_repository, oid); |