From: Patrick Steinhardt Date: Mon, 20 Apr 2026 08:22:44 GMT Subject: [PATCH 14/18] setup: stop using `the_repository` in `upgrade_repository_format()` Message-ID: <20260420-pks-setup-wo-the-repository-v1-14-f4a81c4988e8@pks.im> In-Reply-To: <20260420-pks-setup-wo-the-repository-v1-0-f4a81c4988e8@pks.im> Stop using `the_repository` in `upgrade_repository_format()` and instead accept the repository as a parameter. The injection of `the_repository` is thus bumped one level higher, where callers now pass it in explicitly. Signed-off-by: Patrick Steinhardt --- list-objects-filter-options.c | 2 +- repository.h | 2 +- setup.c | 6 +++--- worktree.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index cef67e5919..bc5d98f9e6 100644 --- a/list-objects-filter-options.c +++ b/list-objects-filter-options.c @@ -378,7 +378,7 @@ void partial_clone_register( */ return; } else { - if (upgrade_repository_format(1) < 0) + if (upgrade_repository_format(the_repository, 1) < 0) die(_("unable to upgrade repository format to support partial clone")); /* Add promisor config for the remote */ diff --git a/repository.h b/repository.h index 7ae3d34484..bb83d03bbf 100644 --- a/repository.h +++ b/repository.h @@ -271,6 +271,6 @@ void repo_update_index_if_able(struct repository *, struct lock_file *); * Return 1 if upgrade repository format to target_version succeeded, * 0 if no upgrade is necessary, and -1 when upgrade is not possible. */ -int upgrade_repository_format(int target_version); +int upgrade_repository_format(struct repository *repo, int target_version); #endif /* REPOSITORY_H */ diff --git a/setup.c b/setup.c index 4d4b43ab28..a4e294b096 100644 --- a/setup.c +++ b/setup.c @@ -802,7 +802,7 @@ static int check_repository_format_gently(struct repository *repo, return 0; } -int upgrade_repository_format(int target_version) +int upgrade_repository_format(struct repository *repo, int target_version) { struct strbuf sb = STRBUF_INIT; struct strbuf err = STRBUF_INIT; @@ -810,7 +810,7 @@ int upgrade_repository_format(int target_version) struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT; int ret; - repo_common_path_append(the_repository, &sb, "config"); + repo_common_path_append(repo, &sb, "config"); read_repository_format(&repo_fmt, sb.buf); strbuf_release(&sb); @@ -832,7 +832,7 @@ int upgrade_repository_format(int target_version) } strbuf_addf(&repo_version, "%d", target_version); - repo_config_set(the_repository, "core.repositoryformatversion", repo_version.buf); + repo_config_set(repo, "core.repositoryformatversion", repo_version.buf); ret = 1; diff --git a/worktree.c b/worktree.c index 56732f8f33..8ca0a172c6 100644 --- a/worktree.c +++ b/worktree.c @@ -1104,7 +1104,7 @@ void write_worktree_linking_files(const char *dotgit, const char *gitdir, strbuf_realpath(&repo, repo.buf, 1); if (use_relative_paths && !the_repository->repository_format_relative_worktrees) { - if (upgrade_repository_format(1) < 0) + if (upgrade_repository_format(the_repository, 1) < 0) die(_("unable to upgrade repository format to support relative worktrees")); if (repo_config_set_gently(the_repository, "extensions.relativeWorktrees", "true")) die(_("unable to set extensions.relativeWorktrees setting")); -- 2.54.0.rc2.529.gd9106f7525.dirty