diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-12 14:22:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-12 14:22:49 -0700 |
| commit | bd99d6e8db5e2c56dd24395e9711ee7ee564bf4f (patch) | |
| tree | b80e6131d230f068d29be426103f2b7fd87150b1 /list-objects.c | |
| parent | 38758be7fa8269a5223ea6c356939e36492f81b1 (diff) | |
| parent | 8a9e27be8213ab90ac761d56ac36229ee52c443f (diff) | |
| download | git-bd99d6e8db5e2c56dd24395e9711ee7ee564bf4f.tar.xz | |
Merge branch 'ps/object-store-cleanup'
Further code clean-up in the object-store layer.
* ps/object-store-cleanup:
object-store: drop `repo_has_object_file()`
treewide: convert users of `repo_has_object_file()` to `has_object()`
object-store: allow fetching objects via `has_object()`
object-store: move function declarations to their respective subsystems
object-store: move and rename `odb_pack_keep()`
object-store: drop `loose_object_path()`
object-store: move `struct packed_git` into "packfile.h"
Diffstat (limited to 'list-objects.c')
| -rw-r--r-- | list-objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c index 1e5512e131..597114281f 100644 --- a/list-objects.c +++ b/list-objects.c @@ -74,7 +74,8 @@ static void process_blob(struct traversal_context *ctx, * of missing objects. */ if (ctx->revs->exclude_promisor_objects && - !repo_has_object_file(the_repository, &obj->oid) && + !has_object(the_repository, &obj->oid, + HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) && is_promisor_object(ctx->revs->repo, &obj->oid)) return; |