diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-07-23 16:08:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-23 08:15:18 -0700 |
| commit | 9ce196e86b455fa2552812802c58f30c090c94af (patch) | |
| tree | fb4d319c7f05ca3f01f3abacd947ba009609bdbf /merge-ort.c | |
| parent | 86c9c14eb9c7bfa20efd8d65f1aaa685282b7221 (diff) | |
| download | git-9ce196e86b455fa2552812802c58f30c090c94af.tar.gz | |
config: drop `git_config()` wrapper
In 036876a1067 (config: hide functions using `the_repository` by
default, 2024-08-13) we have moved around a bunch of functions in the
config subsystem that depend on `the_repository`. Those function have
been converted into mere wrappers around their equivalent function that
takes in a repository as parameter, and the intent was that we'll
eventually remove those wrappers to make the dependency on the global
repository variable explicit at the callsite.
Follow through with that intent and remove `git_config()`. All callsites
are adjusted so that they use `repo_config(the_repository, ...)`
instead. While some callsites might already have a repository available,
this mechanical conversion is the exact same as the current situation
and thus cannot cause any regression. Those sites should eventually be
cleaned up in a later patch series.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index 473ff61e36..49aa37a8f2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -5387,7 +5387,7 @@ static void merge_recursive_config(struct merge_options *opt, int ui) free(value); } } - git_config(git_xmerge_config, NULL); + repo_config(the_repository, git_xmerge_config, NULL); } static void init_merge_options(struct merge_options *opt, |