diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-02 17:06:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-02 17:06:52 -0800 |
| commit | 10dd04a3feef385358d66bf3d653325f64c20d3c (patch) | |
| tree | 2129ba4a8c8b302eb888c5d14ed98139e373a30f /builtin | |
| parent | 02c31a8ddc7a79a4e8f9dd0c437bcf3e73e60203 (diff) | |
| parent | 732ec9b17b78a49496bfb796fcfe606f3a9f02f1 (diff) | |
| download | git-10dd04a3feef385358d66bf3d653325f64c20d3c.tar.xz | |
Merge branch 'ps/object-info-bits-cleanup'
A couple of bugs in use of flag bits around odb API has been
corrected, and the flag bits reordered.
* ps/object-info-bits-cleanup:
odb: convert `odb_has_object()` flags into an enum
odb: convert object info flags into an enum
odb: drop gaps in object info flag values
builtin/fsck: fix flags passed to `odb_has_object()`
builtin/backfill: fix flags passed to `odb_has_object()`
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/backfill.c | 3 | ||||
| -rw-r--r-- | builtin/fsck.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/backfill.c b/builtin/backfill.c index e80fc1b694..d8cb3b0eba 100644 --- a/builtin/backfill.c +++ b/builtin/backfill.c @@ -67,8 +67,7 @@ static int fill_missing_blobs(const char *path UNUSED, return 0; for (size_t i = 0; i < list->nr; i++) { - if (!odb_has_object(ctx->repo->objects, &list->oid[i], - OBJECT_INFO_FOR_PREFETCH)) + if (!odb_has_object(ctx->repo->objects, &list->oid[i], 0)) oid_array_append(&ctx->current_batch, &list->oid[i]); } diff --git a/builtin/fsck.c b/builtin/fsck.c index 80e298049f..384d47ee77 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -162,7 +162,8 @@ static int mark_object(struct object *obj, enum object_type type, return 0; if (!(obj->flags & HAS_OBJ)) { - if (parent && !odb_has_object(the_repository->objects, &obj->oid, 1)) { + if (parent && !odb_has_object(the_repository->objects, &obj->oid, + HAS_OBJECT_RECHECK_PACKED)) { printf_ln(_("broken link from %7s %s\n" " to %7s %s"), printable_type(&parent->oid, parent->type), |