diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-23 13:48:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-23 13:48:48 -0800 |
| commit | b1af291b4adf1c433ad2b79f0390f7d6b516a964 (patch) | |
| tree | 56e0371e44abc3b1b8e27e5bdfbb304a02556b14 /object-file.c | |
| parent | 703c97519dfac64291f79b1772e25c65d233e97e (diff) | |
| parent | 732ec9b17b78a49496bfb796fcfe606f3a9f02f1 (diff) | |
| download | git-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 'object-file.c')
| -rw-r--r-- | object-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/object-file.c b/object-file.c index 8d1d8c778e..098b0541ab 100644 --- a/object-file.c +++ b/object-file.c @@ -399,7 +399,7 @@ static int read_object_info_from_path(struct odb_source *source, const char *path, const struct object_id *oid, struct object_info *oi, - unsigned flags) + enum object_info_flags flags) { int ret; int fd; @@ -541,7 +541,7 @@ out: int odb_source_loose_read_object_info(struct odb_source *source, const struct object_id *oid, struct object_info *oi, - unsigned flags) + enum object_info_flags flags) { static struct strbuf buf = STRBUF_INIT; odb_loose_path(source, &buf, oid); |