From: Patrick Steinhardt Date: Fri, 20 Mar 2026 11:47:09 GMT Subject: [PATCH 04/14] fsck: drop `the_repository` in `fsck_set_msg_types()` Message-ID: <20260320-b4-pks-fsck-without-the-repository-v1-4-6594f997926b@pks.im> In-Reply-To: <20260320-b4-pks-fsck-without-the-repository-v1-0-6594f997926b@pks.im> We implicitly rely on `the_repository` in `fsck_set_msg_types()` because of our reliance on `the_hash_algo`. Fix this dependency on global state by requiring the callers to provide the hash function. Signed-off-by: Patrick Steinhardt --- builtin/index-pack.c | 6 ++++-- builtin/unpack-objects.c | 3 ++- fsck.c | 27 +++++++++++++++++++-------- fsck.h | 3 ++- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 3d1f7dbd5f..c4117e5970 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1932,13 +1932,15 @@ int cmd_index_pack(int argc, } else if (skip_to_optional_arg(arg, "--strict", &arg)) { strict = 1; do_fsck_object = 1; - fsck_set_msg_types(&fsck_options, arg); + fsck_set_msg_types(&fsck_options, arg, + the_hash_algo); } else if (!strcmp(arg, "--check-self-contained-and-connected")) { strict = 1; check_self_contained_and_connected = 1; } else if (skip_to_optional_arg(arg, "--fsck-objects", &arg)) { do_fsck_object = 1; - fsck_set_msg_types(&fsck_options, arg); + fsck_set_msg_types(&fsck_options, arg, + the_hash_algo); } else if (!strcmp(arg, "--verify")) { verify = 1; } else if (!strcmp(arg, "--verify-stat")) { diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 9596b3ea4f..3e748a55d9 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -649,7 +649,8 @@ int cmd_unpack_objects(int argc, } if (skip_prefix(arg, "--strict=", &arg)) { strict = 1; - fsck_set_msg_types(&fsck_options, arg); + fsck_set_msg_types(&fsck_options, arg, + the_hash_algo); continue; } if (skip_prefix(arg, "--pack_header=", &arg)) { diff --git a/fsck.c b/fsck.c index a7ebab9581..efd987dd2b 100644 --- a/fsck.c +++ b/fsck.c @@ -182,7 +182,8 @@ void fsck_set_msg_type(struct fsck_options *options, free(to_free); } -void fsck_set_msg_types(struct fsck_options *options, const char *values) +void fsck_set_msg_types(struct fsck_options *options, const char *values, + const struct git_hash_algo *algo) { char *buf = xstrdup(values), *to_free = buf; int done = 0; @@ -207,7 +208,7 @@ void fsck_set_msg_types(struct fsck_options *options, const char *values) if (equal == len) die("skiplist requires a path"); oidset_parse_file(&options->skip_oids, buf + equal + 1, - the_repository->hash_algo); + algo); buf += len + 1; continue; } @@ -1404,11 +1405,16 @@ void fsck_options_clear(struct fsck_options *options) kh_clear_oid_map(options->object_names); } +struct fsck_options_parse_config_key_data { + struct repository *repo; + struct fsck_options *options; +}; + static int fsck_options_parse_config_key(const char *var, const char *value, const struct config_context *ctx, - void *cb) + void *cb_data) { - struct fsck_options *options = cb; + struct fsck_options_parse_config_key_data *data = cb_data; const char *msg_id; if (strcmp(var, "fsck.skiplist") == 0) { @@ -1420,7 +1426,8 @@ static int fsck_options_parse_config_key(const char *var, const char *value, struct strbuf sb = STRBUF_INIT; strbuf_addf(&sb, "skiplist=%s", path); free(path); - fsck_set_msg_types(options, sb.buf); + fsck_set_msg_types(data->options, sb.buf, + data->repo->hash_algo); strbuf_release(&sb); } return 0; @@ -1429,17 +1436,21 @@ static int fsck_options_parse_config_key(const char *var, const char *value, if (skip_prefix(var, "fsck.", &msg_id)) { if (!value) return config_error_nonbool(var); - fsck_set_msg_type(options, msg_id, value); + fsck_set_msg_type(data->options, msg_id, value); return 0; } - return git_default_config(var, value, ctx, cb); + return git_default_config(var, value, ctx, cb_data); } void fsck_options_parse_config(struct fsck_options *options, struct repository *repo) { - repo_config(repo, fsck_options_parse_config_key, options); + struct fsck_options_parse_config_key_data data = { + .repo = repo, + .options = options, + }; + repo_config(repo, fsck_options_parse_config_key, &data); } /* diff --git a/fsck.h b/fsck.h index 7d0d876103..3ca1683f74 100644 --- a/fsck.h +++ b/fsck.h @@ -118,7 +118,8 @@ void fsck_set_msg_type_from_ids(struct fsck_options *options, enum fsck_msg_type msg_type); void fsck_set_msg_type(struct fsck_options *options, const char *msg_id, const char *msg_type); -void fsck_set_msg_types(struct fsck_options *options, const char *values); +void fsck_set_msg_types(struct fsck_options *options, const char *values, + const struct git_hash_algo *algo); int is_valid_msg_type(const char *msg_id, const char *msg_type); /* -- 2.53.0.1055.ga2ffed1127.dirty