undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule: factor out a config_set_in_gitmodules_file_gently function

Browse Source 
Introduce a new config_set_in_gitmodules_file_gently() 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".

The purpose of the change is mainly to centralize the code that writes
to the .gitmodules file to avoid some duplication.

The naming follows git_config_set_in_file_gently() but the git_ prefix
is removed to communicate that this is not a generic git-config API.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Antonio Ospite 2018-10-05 15:05:53 +02:00 committed by Junio C Hamano
parent bcbc780d14
commit 45f5ef3d77
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodule-config.c
View File

@ -707,6 +707,18 @@ int print_config_from_gitmodules(struct repository *repo, const char *key)
return 0; return 0;
} }
int config_set_in_gitmodules_file_gently(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;
}
struct fetch_config { struct fetch_config {
int *max_children; int *max_children;
int *recurse_submodules; int *recurse_submodules;

1
submodule-config.h
View File

@ -49,6 +49,7 @@ const struct submodule *submodule_from_path(struct repository *r,
const char *path); const char *path);
void submodule_free(struct repository *r); void submodule_free(struct repository *r);
int print_config_from_gitmodules(struct repository *repo, const char *key); int print_config_from_gitmodules(struct repository *repo, const char *key);
int config_set_in_gitmodules_file_gently(const char *key, const char *value);
/* /*
* Returns 0 if the name is syntactically acceptable as a submodule "name" * Returns 0 if the name is syntactically acceptable as a submodule "name"

10
submodule.c
View File

@ -89,6 +89,7 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
{ {
struct strbuf entry = STRBUF_INIT; struct strbuf entry = STRBUF_INIT;
const struct submodule *submodule; const struct submodule *submodule;
int ret;
if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */ if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
return -1; return -1;
@ -104,14 +105,9 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
strbuf_addstr(&entry, "submodule."); strbuf_addstr(&entry, "submodule.");
strbuf_addstr(&entry, submodule->name); strbuf_addstr(&entry, submodule->name);
strbuf_addstr(&entry, ".path"); strbuf_addstr(&entry, ".path");
if (git_config_set_in_file_gently(GITMODULES_FILE, entry.buf, newpath) < 0) { ret = config_set_in_gitmodules_file_gently(entry.buf, newpath);
/* Maybe the user already did that, don't error out here */
warning(_("Could not update .gitmodules entry %s"), entry.buf);
strbuf_release(&entry); strbuf_release(&entry);
return -1; return ret;
}
strbuf_release(&entry);
return 0;
} }
/* /*