[RFC PATCH 02/10] submodule: factor out a config_gitmodules_set function
- From
Antonio Ospite <ao2@ao2.it>
- Date
- May 14, 2018, 10:58 UTC
- Message-ID
- <20180514105823.8378-3-ao2@ao2.it>
- In-Reply-To
- <20180514105823.8378-1-ao2@ao2.it>
Introduce a new config_gitmodules_set function to write config values to the .gitmodules file.
This is in preparation for a future change which will use the function to write to the .gitmodules file in a more controlled way instead of using "git config -f .gitmodules".
Signed-off-by: Antonio Ospite <ao2@ao2.it> ---
Not sure about the name, and maybe it can go in config.c for symmetry with config_from_gitmodules?
submodule.c | 22 +++++++++++++++------- submodule.h | 1 + 2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/submodule.c b/submodule.c index 74d35b257..7cfae89b6 100644 --- a/submodule.c +++ b/submodule.c @@ -80,6 +80,18 @@ static int for_each_remote_ref_submodule(const char *submodule, fn, cb_data); } +int config_gitmodules_set(const char *key, const char *value) +{ + int ret; + + ret = git_config_set_in_file_gently(GITMODULES_FILE, key, value); + if (ret < 0) + /* Maybe the user already did that, don't error out here */ + warning(_("Could not update .gitmodules entry %s"), key); + + return ret; +} + /* * Try to update the "path" entry in the "submodule.<name>" section of the * .gitmodules file. Return 0 only if a .gitmodules file was found, a section @@ -89,6 +101,7 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath) { struct strbuf entry = STRBUF_INIT; const struct submodule *submodule; + int ret; if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */ return -1; @@ -104,14 +117,9 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath) strbuf_addstr(&entry, "submodule."); strbuf_addstr(&entry, submodule->name); strbuf_addstr(&entry, ".path"); - if (git_config_set_in_file_gently(GITMODULES_FILE, entry.buf, newpath) < 0) { - /* Maybe the user already did that, don't error out here */ - warning(_("Could not update .gitmodules entry %s"), entry.buf); - strbuf_release(&entry); - return -1; - } + ret = config_gitmodules_set(entry.buf, newpath); strbuf_release(&entry); - return 0; + return ret; } /* diff --git a/submodule.h b/submodule.h index e5526f6aa..8a252e514 100644 --- a/submodule.h +++ b/submodule.h @@ -35,6 +35,7 @@ struct submodule_update_strategy { extern int is_gitmodules_unmerged(const struct index_state *istate); extern int is_staging_gitmodules_ok(struct index_state *istate); +extern int config_gitmodules_set(const char *key, const char *value); extern int update_path_in_gitmodules(const char *oldpath, const char *newpath); extern int remove_path_from_gitmodules(const char *path); extern void stage_updated_gitmodules(struct index_state *istate);
-- 2.17.0