setup: stop using `the_repository` in `upgrade_repository_format()`
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 <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
May 19, 2026 at 11:52 UTC
9cae7229c99bb606dcbe81b454bf19ada82769a4
4 files changed
+6
-6
list-objects-filter-options.c
+1
-1
@@ -378,7 +378,7 @@ void partial_clone_register(
378
*/
379
return;
380
} else {
381
- if (upgrade_repository_format(1) < 0)
381
+ if (upgrade_repository_format(the_repository, 1) < 0)
382
die(_("unable to upgrade repository format to support partial clone"));
383
384
/* Add promisor config for the remote */
repository.h
+1
-1
@@ -281,6 +281,6 @@ void repo_update_index_if_able(struct repository *, struct lock_file *);
281
* Return 1 if upgrade repository format to target_version succeeded,
282
* 0 if no upgrade is necessary, and -1 when upgrade is not possible.
283
*/
284
-int upgrade_repository_format(int target_version);
284
+int upgrade_repository_format(struct repository *repo, int target_version);
285
286
#endif /* REPOSITORY_H */
setup.c
+3
-3
@@ -811,7 +811,7 @@ static int check_repository_format_gently(struct repository *repo,
811
return 0;
812
}
813
814
-int upgrade_repository_format(int target_version)
814
+int upgrade_repository_format(struct repository *repo, int target_version)
815
{
816
struct strbuf sb = STRBUF_INIT;
817
struct strbuf err = STRBUF_INIT;
@@ -819,7 +819,7 @@ int upgrade_repository_format(int target_version)
819
struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
820
int ret;
821
822
- repo_common_path_append(the_repository, &sb, "config");
822
+ repo_common_path_append(repo, &sb, "config");
823
read_repository_format(&repo_fmt, sb.buf);
824
strbuf_release(&sb);
825
@@ -841,7 +841,7 @@ int upgrade_repository_format(int target_version)
841
}
842
843
strbuf_addf(&repo_version, "%d", target_version);
844
- repo_config_set(the_repository, "core.repositoryformatversion", repo_version.buf);
844
+ repo_config_set(repo, "core.repositoryformatversion", repo_version.buf);
845
846
ret = 1;
847
worktree.c
+1
-1
@@ -1104,7 +1104,7 @@ void write_worktree_linking_files(const char *dotgit, const char *gitdir,
1104
strbuf_realpath(&repo, repo.buf, 1);
1105
1106
if (use_relative_paths && !the_repository->repository_format_relative_worktrees) {
1107
- if (upgrade_repository_format(1) < 0)
1107
+ if (upgrade_repository_format(the_repository, 1) < 0)
1108
die(_("unable to upgrade repository format to support relative worktrees"));
1109
if (repo_config_set_gently(the_repository, "extensions.relativeWorktrees", "true"))
1110
die(_("unable to set extensions.relativeWorktrees setting"));