aboutsummaryrefslogtreecommitdiff
path: root/odb.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-02-23 13:48:48 -0800
committerJunio C Hamano <gitster@pobox.com>2026-02-23 13:48:48 -0800
commitb1af291b4adf1c433ad2b79f0390f7d6b516a964 (patch)
tree56e0371e44abc3b1b8e27e5bdfbb304a02556b14 /odb.c
parent703c97519dfac64291f79b1772e25c65d233e97e (diff)
parent732ec9b17b78a49496bfb796fcfe606f3a9f02f1 (diff)
downloadgit-b1af291b4adf1c433ad2b79f0390f7d6b516a964.tar.xz
Merge branch 'ps/object-info-bits-cleanup' into ps/odb-sources
* 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 'odb.c')
-rw-r--r--odb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/odb.c b/odb.c
index 025cd76520..776de5356c 100644
--- a/odb.c
+++ b/odb.c
@@ -844,7 +844,7 @@ static int oid_object_info_convert(struct repository *r,
int odb_read_object_info_extended(struct object_database *odb,
const struct object_id *oid,
struct object_info *oi,
- unsigned flags)
+ enum object_info_flags flags)
{
int ret;
@@ -966,7 +966,7 @@ void *odb_read_object_peeled(struct object_database *odb,
}
int odb_has_object(struct object_database *odb, const struct object_id *oid,
- unsigned flags)
+ enum has_object_flags flags)
{
unsigned object_info_flags = 0;