[PATCH 2/3] builtin/fsck: fix flags passed to `odb_has_object()`
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jan 26, 2026, 12:17 UTC
- Message-ID
- <20260126-b4-pks-read-object-info-flags-v1-2-e682a003b17c@pks.im>
- In-Reply-To
- <20260126-b4-pks-read-object-info-flags-v1-0-e682a003b17c@pks.im>
In `mark_object()` we invoke `has_object()` with a value of 1. This is somewhat fishy given that the function expects a bitset of flags, so any behaviour that this results in is purely coincidental and may break at any point in time.
The call to `has_object()` was originally introduced in 9eb86f41de (fsck: do not lazy fetch known non-promisor object, 2020-08-05). The intent here was to skip lazy fetches of promisor objects: we have already verified that the object is not a promisor object, so if the object is missing it indicates a corrupt repository.
The hardcoded value that we pass maps to `HAS_OBJECT_RECHECK_PACKED`, which is probably the intended behaviour: `odb_has_object()` will not fetch promisor objects unless `HAS_OBJECT_FETCH_PROMISOR` is passed, but we may want to verify that no concurrent process has written the object that we're trying to read.
Convert the code to use the named flag instead of the the hardcoded value.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/fsck.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fsck.c b/builtin/fsck.c index 0512f78a87..1d059dd6c2 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),
-- 2.53.0.rc1.267.g6e3a78c723.dirty