kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config: drop `git_config_set_gently()` 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_set_gently()`.
All callsites are adjusted so that they use
`repo_config_set_gently(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>
maint
Patrick Steinhardt 2025-07-23 16:08:34 +02:00 committed by Junio C Hamano
parent 122e38c92f
commit b1659e63e2
8 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
branch.c
View File

@ -116,7 +116,7 @@ static int install_branch_config_multiple_remotes(int flag, const char *local,
} }


strbuf_addf(&key, "branch.%s.remote", local); strbuf_addf(&key, "branch.%s.remote", local);
if (git_config_set_gently(key.buf, origin ? origin : ".") < 0) if (repo_config_set_gently(the_repository, key.buf, origin ? origin : ".") < 0)
goto out_err; goto out_err;


strbuf_reset(&key); strbuf_reset(&key);
@ -127,7 +127,7 @@ static int install_branch_config_multiple_remotes(int flag, const char *local,
* more than one is provided, use CONFIG_REGEX_NONE to preserve what * more than one is provided, use CONFIG_REGEX_NONE to preserve what
* we've written so far. * we've written so far.
*/ */
if (git_config_set_gently(key.buf, NULL) < 0) if (repo_config_set_gently(the_repository, key.buf, NULL) < 0)
goto out_err; goto out_err;
for_each_string_list_item(item, remotes) for_each_string_list_item(item, remotes)
if (git_config_set_multivar_gently(key.buf, item->string, CONFIG_REGEX_NONE, 0) < 0) if (git_config_set_multivar_gently(key.buf, item->string, CONFIG_REGEX_NONE, 0) < 0)
@ -136,7 +136,7 @@ static int install_branch_config_multiple_remotes(int flag, const char *local,
if (rebasing) { if (rebasing) {
strbuf_reset(&key); strbuf_reset(&key);
strbuf_addf(&key, "branch.%s.rebase", local); strbuf_addf(&key, "branch.%s.rebase", local);
if (git_config_set_gently(key.buf, "true") < 0) if (repo_config_set_gently(the_repository, key.buf, "true") < 0)
goto out_err; goto out_err;
} }
strbuf_release(&key); strbuf_release(&key);

2
builtin/clone.c
View File

@ -1467,7 +1467,7 @@ int cmd_clone(int argc,
warning(_("failed to fetch objects from bundle URI '%s'"), warning(_("failed to fetch objects from bundle URI '%s'"),
bundle_uri); bundle_uri);
else if (has_heuristic) else if (has_heuristic)
git_config_set_gently("fetch.bundleuri", bundle_uri); repo_config_set_gently(the_repository, "fetch.bundleuri", bundle_uri);


remote_state_clear(the_repository->remote_state); remote_state_clear(the_repository->remote_state);
free(the_repository->remote_state); free(the_repository->remote_state);

6
builtin/remote.c
View File

@ -694,7 +694,7 @@ static void handle_push_default(const char* old_name, const char* new_name)
if (push_default.scope >= CONFIG_SCOPE_COMMAND) if (push_default.scope >= CONFIG_SCOPE_COMMAND)
; /* pass */ ; /* pass */
else if (push_default.scope >= CONFIG_SCOPE_LOCAL) { else if (push_default.scope >= CONFIG_SCOPE_LOCAL) {
int result = git_config_set_gently("remote.pushDefault", int result = repo_config_set_gently(the_repository, "remote.pushDefault",
new_name); new_name);
if (new_name && result && result != CONFIG_NOTHING_SET) if (new_name && result && result != CONFIG_NOTHING_SET)
die(_("could not set '%s'"), "remote.pushDefault"); die(_("could not set '%s'"), "remote.pushDefault");
@ -934,7 +934,7 @@ static int rm(int argc, const char **argv, const char *prefix,
strbuf_reset(&buf); strbuf_reset(&buf);
strbuf_addf(&buf, "branch.%s.%s", strbuf_addf(&buf, "branch.%s.%s",
item->string, *k); item->string, *k);
result = git_config_set_gently(buf.buf, NULL); result = repo_config_set_gently(the_repository, buf.buf, NULL);
if (result && result != CONFIG_NOTHING_SET) if (result && result != CONFIG_NOTHING_SET)
die(_("could not unset '%s'"), buf.buf); die(_("could not unset '%s'"), buf.buf);
} }
@ -942,7 +942,7 @@ static int rm(int argc, const char **argv, const char *prefix,
if (info->push_remote_name && !strcmp(info->push_remote_name, remote->name)) { if (info->push_remote_name && !strcmp(info->push_remote_name, remote->name)) {
strbuf_reset(&buf); strbuf_reset(&buf);
strbuf_addf(&buf, "branch.%s.pushremote", item->string); strbuf_addf(&buf, "branch.%s.pushremote", item->string);
result = git_config_set_gently(buf.buf, NULL); result = repo_config_set_gently(the_repository, buf.buf, NULL);
if (result && result != CONFIG_NOTHING_SET) if (result && result != CONFIG_NOTHING_SET)
die(_("could not unset '%s'"), buf.buf); die(_("could not unset '%s'"), buf.buf);
} }

14
builtin/submodule--helper.c
View File

@ -458,7 +458,7 @@ static void init_submodule(const char *path, const char *prefix,
*/ */
if (!is_submodule_active(the_repository, path)) { if (!is_submodule_active(the_repository, path)) {
strbuf_addf(&sb, "submodule.%s.active", sub->name); strbuf_addf(&sb, "submodule.%s.active", sub->name);
git_config_set_gently(sb.buf, "true"); repo_config_set_gently(the_repository, sb.buf, "true");
strbuf_reset(&sb); strbuf_reset(&sb);
} }


@ -484,7 +484,7 @@ static void init_submodule(const char *path, const char *prefix,
free(oldurl); free(oldurl);
} }


if (git_config_set_gently(sb.buf, url)) if (repo_config_set_gently(the_repository, sb.buf, url))
die(_("Failed to register url for submodule path '%s'"), die(_("Failed to register url for submodule path '%s'"),
displaypath); displaypath);
if (!(flags & OPT_QUIET)) if (!(flags & OPT_QUIET))
@ -506,7 +506,7 @@ static void init_submodule(const char *path, const char *prefix,
upd = submodule_update_type_to_string(sub->update_strategy.type); upd = submodule_update_type_to_string(sub->update_strategy.type);
} }


if (git_config_set_gently(sb.buf, upd)) if (repo_config_set_gently(the_repository, sb.buf, upd))
die(_("Failed to register update mode for submodule path '%s'"), displaypath); die(_("Failed to register update mode for submodule path '%s'"), displaypath);
} }
strbuf_release(&sb); strbuf_release(&sb);
@ -1262,7 +1262,7 @@ static void sync_submodule(const char *path, const char *prefix,


strbuf_reset(&sb); strbuf_reset(&sb);
strbuf_addf(&sb, "submodule.%s.url", sub->name); strbuf_addf(&sb, "submodule.%s.url", sub->name);
if (git_config_set_gently(sb.buf, super_config_url)) if (repo_config_set_gently(the_repository, sb.buf, super_config_url))
die(_("failed to register url for submodule path '%s'"), die(_("failed to register url for submodule path '%s'"),
displaypath); displaypath);


@ -3309,7 +3309,7 @@ static void configure_added_submodule(struct add_data *add_data)
struct child_process add_gitmodules = CHILD_PROCESS_INIT; struct child_process add_gitmodules = CHILD_PROCESS_INIT;


key = xstrfmt("submodule.%s.url", add_data->sm_name); key = xstrfmt("submodule.%s.url", add_data->sm_name);
git_config_set_gently(key, add_data->realrepo); repo_config_set_gently(the_repository, key, add_data->realrepo);
free(key); free(key);


add_submod.git_cmd = 1; add_submod.git_cmd = 1;
@ -3356,12 +3356,12 @@ static void configure_added_submodule(struct add_data *add_data)
*/ */
if (!is_submodule_active(the_repository, add_data->sm_path)) { if (!is_submodule_active(the_repository, add_data->sm_path)) {
key = xstrfmt("submodule.%s.active", add_data->sm_name); key = xstrfmt("submodule.%s.active", add_data->sm_name);
git_config_set_gently(key, "true"); repo_config_set_gently(the_repository, key, "true");
free(key); free(key);
} }
} else { } else {
key = xstrfmt("submodule.%s.active", add_data->sm_name); key = xstrfmt("submodule.%s.active", add_data->sm_name);
git_config_set_gently(key, "true"); repo_config_set_gently(the_repository, key, "true");
free(key); free(key);
} }
} }

5
config.h
View File

@ -734,11 +734,6 @@ static inline int git_config_get_pathname(const char *key, char **dest)
return repo_config_get_pathname(the_repository, key, dest); return repo_config_get_pathname(the_repository, key, dest);
} }


static inline int git_config_set_gently(const char *key, const char *value)
{
return repo_config_set_gently(the_repository, key, value);
}

static inline void git_config_set(const char *key, const char *value) static inline void git_config_set(const char *key, const char *value)
{ {
repo_config_set(the_repository, key, value); repo_config_set(the_repository, key, value);

4
scalar.c
View File

@ -103,7 +103,7 @@ static int set_scalar_config(const struct scalar_config *config, int reconfigure
if ((reconfigure && config->overwrite_on_reconfigure) || if ((reconfigure && config->overwrite_on_reconfigure) ||
repo_config_get_string(the_repository, config->key, &value)) { repo_config_get_string(the_repository, config->key, &value)) {
trace2_data_string("scalar", the_repository, config->key, "created"); trace2_data_string("scalar", the_repository, config->key, "created");
res = git_config_set_gently(config->key, config->value); res = repo_config_set_gently(the_repository, config->key, config->value);
} else { } else {
trace2_data_string("scalar", the_repository, config->key, "exists"); trace2_data_string("scalar", the_repository, config->key, "exists");
res = 0; res = 0;
@ -322,7 +322,7 @@ static int set_config(const char *fmt, ...)
value = strchr(buf.buf, '='); value = strchr(buf.buf, '=');
if (value) if (value)
*(value++) = '\0'; *(value++) = '\0';
res = git_config_set_gently(buf.buf, value); res = repo_config_set_gently(the_repository, buf.buf, value);
strbuf_release(&buf); strbuf_release(&buf);


return res; return res;

4
setup.c
View File

@ -2236,13 +2236,13 @@ void initialize_repository_version(int hash_algo,
git_config_set("extensions.objectformat", git_config_set("extensions.objectformat",
hash_algos[hash_algo].name); hash_algos[hash_algo].name);
else if (reinit) else if (reinit)
git_config_set_gently("extensions.objectformat", NULL); repo_config_set_gently(the_repository, "extensions.objectformat", NULL);


if (ref_storage_format != REF_STORAGE_FORMAT_FILES) if (ref_storage_format != REF_STORAGE_FORMAT_FILES)
git_config_set("extensions.refstorage", git_config_set("extensions.refstorage",
ref_storage_format_to_name(ref_storage_format)); ref_storage_format_to_name(ref_storage_format));
else if (reinit) else if (reinit)
git_config_set_gently("extensions.refstorage", NULL); repo_config_set_gently(the_repository, "extensions.refstorage", NULL);


if (reinit) { if (reinit) {
struct strbuf config = STRBUF_INIT; struct strbuf config = STRBUF_INIT;

4
worktree.c
View File

@ -1013,7 +1013,7 @@ int init_worktree_config(struct repository *r)
*/ */
if (r->repository_format_worktree_config) if (r->repository_format_worktree_config)
return 0; return 0;
if ((res = git_config_set_gently("extensions.worktreeConfig", "true"))) if ((res = repo_config_set_gently(the_repository, "extensions.worktreeConfig", "true")))
return error(_("failed to set extensions.worktreeConfig setting")); return error(_("failed to set extensions.worktreeConfig setting"));


common_config_file = xstrfmt("%s/config", r->commondir); common_config_file = xstrfmt("%s/config", r->commondir);
@ -1077,7 +1077,7 @@ void write_worktree_linking_files(struct strbuf dotgit, struct strbuf gitdir,
if (use_relative_paths && !the_repository->repository_format_relative_worktrees) { if (use_relative_paths && !the_repository->repository_format_relative_worktrees) {
if (upgrade_repository_format(1) < 0) if (upgrade_repository_format(1) < 0)
die(_("unable to upgrade repository format to support relative worktrees")); die(_("unable to upgrade repository format to support relative worktrees"));
if (git_config_set_gently("extensions.relativeWorktrees", "true")) if (repo_config_set_gently(the_repository, "extensions.relativeWorktrees", "true"))
die(_("unable to set extensions.relativeWorktrees setting")); die(_("unable to set extensions.relativeWorktrees setting"));
the_repository->repository_format_relative_worktrees = 1; the_repository->repository_format_relative_worktrees = 1;
} }