config: drop git_config_get() wrapper
In 036876a106 (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_get()`. All
callsites are adjusted so that they use `repo_config_get(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>
This commit is contained in:
committed by
Junio C Hamano
parent
83bd9e03ed
commit
7807051e9b
@@ -1916,7 +1916,7 @@ static int maintenance_register(int argc, const char **argv, const char *prefix,
|
|||||||
git_config_set("maintenance.auto", "false");
|
git_config_set("maintenance.auto", "false");
|
||||||
|
|
||||||
/* Set maintenance strategy, if unset */
|
/* Set maintenance strategy, if unset */
|
||||||
if (git_config_get("maintenance.strategy"))
|
if (repo_config_get(the_repository, "maintenance.strategy"))
|
||||||
git_config_set("maintenance.strategy", "incremental");
|
git_config_set("maintenance.strategy", "incremental");
|
||||||
|
|
||||||
if (!git_config_get_string_multi(key, &list)) {
|
if (!git_config_get_string_multi(key, &list)) {
|
||||||
|
|||||||
@@ -549,7 +549,7 @@ static int module_init(int argc, const char **argv, const char *prefix,
|
|||||||
* If there are no path args and submodule.active is set then,
|
* If there are no path args and submodule.active is set then,
|
||||||
* by default, only initialize 'active' modules.
|
* by default, only initialize 'active' modules.
|
||||||
*/
|
*/
|
||||||
if (!argc && !git_config_get("submodule.active"))
|
if (!argc && !repo_config_get(the_repository, "submodule.active"))
|
||||||
module_list_active(&list);
|
module_list_active(&list);
|
||||||
|
|
||||||
info.prefix = prefix;
|
info.prefix = prefix;
|
||||||
@@ -2878,7 +2878,7 @@ static int module_update(int argc, const char **argv, const char *prefix,
|
|||||||
* If there are no path args and submodule.active is set then,
|
* If there are no path args and submodule.active is set then,
|
||||||
* by default, only initialize 'active' modules.
|
* by default, only initialize 'active' modules.
|
||||||
*/
|
*/
|
||||||
if (!argc && !git_config_get("submodule.active"))
|
if (!argc && !repo_config_get(the_repository, "submodule.active"))
|
||||||
module_list_active(&list);
|
module_list_active(&list);
|
||||||
|
|
||||||
info.prefix = opt.prefix;
|
info.prefix = opt.prefix;
|
||||||
@@ -3349,7 +3349,7 @@ static void configure_added_submodule(struct add_data *add_data)
|
|||||||
* is_submodule_active(), since that function needs to find
|
* is_submodule_active(), since that function needs to find
|
||||||
* out the value of "submodule.active" again anyway.
|
* out the value of "submodule.active" again anyway.
|
||||||
*/
|
*/
|
||||||
if (!git_config_get("submodule.active")) {
|
if (!repo_config_get(the_repository, "submodule.active")) {
|
||||||
/*
|
/*
|
||||||
* If the submodule being added isn't already covered by the
|
* If the submodule being added isn't already covered by the
|
||||||
* current configured pathspec, set the submodule's active flag
|
* current configured pathspec, set the submodule's active flag
|
||||||
|
|||||||
5
config.h
5
config.h
@@ -719,11 +719,6 @@ NORETURN void git_die_config_linenr(const char *key, const char *filename, int l
|
|||||||
int lookup_config(const char **mapping, int nr_mapping, const char *var);
|
int lookup_config(const char **mapping, int nr_mapping, const char *var);
|
||||||
|
|
||||||
# ifdef USE_THE_REPOSITORY_VARIABLE
|
# ifdef USE_THE_REPOSITORY_VARIABLE
|
||||||
static inline int git_config_get(const char *key)
|
|
||||||
{
|
|
||||||
return repo_config_get(the_repository, key);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int git_config_get_value(const char *key, const char **value)
|
static inline int git_config_get_value(const char *key, const char **value)
|
||||||
{
|
{
|
||||||
return repo_config_get_value(the_repository, key, value);
|
return repo_config_get_value(the_repository, key, value);
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ int cmd__config(int argc, const char **argv)
|
|||||||
} else if (argc == 3 && !strcmp(argv[1], "get")) {
|
} else if (argc == 3 && !strcmp(argv[1], "get")) {
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!(ret = git_config_get(argv[2])))
|
if (!(ret = repo_config_get(the_repository, argv[2])))
|
||||||
goto exit0;
|
goto exit0;
|
||||||
else if (ret == 1)
|
else if (ret == 1)
|
||||||
printf("Value not found for \"%s\"\n", argv[2]);
|
printf("Value not found for \"%s\"\n", argv[2]);
|
||||||
|
|||||||
Reference in New Issue
Block a user