[PATCH v3 4/6] config: add repo_config_set_worktree_gently()
From: Derrick Stolee via GitGitGadget <hidden>
Date: 2021-12-28 21:32:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Derrick Stolee <redacted> Some config settings, such as those for sparse-checkout, are likely intended to only apply to one worktree at a time. To make this write easier, add a new config API method, repo_config_set_worktree_gently(). This method will attempt to write to the worktree-specific config, but will instead write to the common config file if worktree config is not enabled. The next change will introduce a consumer of this method. Signed-off-by: Derrick Stolee <redacted> --- config.c | 21 +++++++++++++++++++++ config.h | 8 ++++++++ 2 files changed, 29 insertions(+)
diff --git a/config.c b/config.c
index 9c9eef16018..f849aef253c 100644
--- a/config.c
+++ b/config.c@@ -21,6 +21,7 @@ #include "dir.h" #include "color.h" #include "refs.h" +#include "worktree.h" struct config_source { struct config_source *prev;
@@ -2880,6 +2881,20 @@ int git_config_set_gently(const char *key, const char *value) return git_config_set_multivar_gently(key, value, NULL, 0); } +int repo_config_set_worktree_gently(struct repository *r, + const char *key, const char *value) +{ + /* Only use worktree-specific config if it is is already enabled. */ + if (repository_format_worktree_config) { + char *file = repo_git_path(r, "config.worktree"); + int ret = git_config_set_multivar_in_file_gently( + file, key, value, NULL, 0); + free(file); + return ret; + } + return repo_config_set_gently(r, key, value); +} + void git_config_set(const char *key, const char *value) { repo_config_set(the_repository, key, value);
@@ -3195,6 +3210,12 @@ int repo_config_set_multivar_gently(struct repository *r, const char *key, flags); } +int repo_config_set_gently(struct repository *r, + const char *key, const char *value) +{ + return repo_config_set_multivar_gently(r, key, value, NULL, 0); +} + void git_config_set_multivar(const char *key, const char *value, const char *value_pattern, unsigned flags) {
diff --git a/config.h b/config.h
index 5531fc018e3..1386009fac8 100644
--- a/config.h
+++ b/config.h@@ -253,6 +253,13 @@ void git_config_set_in_file(const char *, const char *, const char *); int git_config_set_gently(const char *, const char *); +/** + * Write a config value that should apply to the current worktree. If + * extensions.worktreeConfig is enabled, then the write will happen in the + * current worktree's config. Otherwise, write to the common config file. + */ +int repo_config_set_worktree_gently(struct repository *, const char *, const char *); + /** * write config values to `.git/config`, takes a key/value pair as parameter. */
@@ -288,6 +295,7 @@ int git_config_set_multivar_gently(const char *, const char *, const char *, uns void git_config_set_multivar(const char *, const char *, const char *, unsigned); int repo_config_set_multivar_gently(struct repository *, const char *, const char *, const char *, unsigned); void repo_config_set_multivar(struct repository *, const char *, const char *, const char *, unsigned); +int repo_config_set_gently(struct repository *, const char *, const char *); int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, unsigned); /**
--
gitgitgadget