| Message ID | 20180917140940.3839-2-ao2@ao2.it (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Make submodules work if .gitmodules is not checked out | expand |
On Mon, 17 Sep 2018 16:09:32 +0200 Antonio Ospite <ao2@ao2.it> wrote: > Add a new print_config_from_gitmodules() helper function to print values > from .gitmodules just like "git config -f .gitmodules" would. > [...] > +int print_config_from_gitmodules(const char *key) I am thinking about adding a "struct repository" argument to this function > +{ > + int ret; > + char *store_key; > + > + ret = git_config_parse_key(key, &store_key, NULL); > + if (ret < 0) > + return CONFIG_INVALID_KEY; > + > + config_from_gitmodules(config_print_callback, the_repository, store_key); And use it here, to avoid another usage of "the_repository" when it's not strictly necessary. Ciao, Antonio
> > +int print_config_from_gitmodules(const char *key) > > I am thinking about adding a "struct repository" argument to this > function Sounds like a good idea.
diff --git a/submodule-config.c b/submodule-config.c index fc2c41b947..f70b7f1baf 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -682,6 +682,31 @@ void submodule_free(struct repository *r) submodule_cache_clear(r->submodule_cache); } +static int config_print_callback(const char *var, const char *value, void *cb_data) +{ + char *wanted_key = cb_data; + + if (!strcmp(wanted_key, var)) + printf("%s\n", value); + + return 0; +} + +int print_config_from_gitmodules(const char *key) +{ + int ret; + char *store_key; + + ret = git_config_parse_key(key, &store_key, NULL); + if (ret < 0) + return CONFIG_INVALID_KEY; + + config_from_gitmodules(config_print_callback, the_repository, store_key); + + free(store_key); + return 0; +} + struct fetch_config { int *max_children; int *recurse_submodules; diff --git a/submodule-config.h b/submodule-config.h index dc7278eea4..dd7f1b9a46 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -48,6 +48,7 @@ const struct submodule *submodule_from_path(struct repository *r, const struct object_id *commit_or_tree, const char *path); void submodule_free(struct repository *r); +int print_config_from_gitmodules(const char *key); /* * Returns 0 if the name is syntactically acceptable as a submodule "name"
Add a new print_config_from_gitmodules() helper function to print values from .gitmodules just like "git config -f .gitmodules" would. This will be used by a new submodule--helper subcommand to be able to access the .gitmodules file in a more controlled way. Signed-off-by: Antonio Ospite <ao2@ao2.it> --- submodule-config.c | 25 +++++++++++++++++++++++++ submodule-config.h | 1 + 2 files changed, 26 insertions(+)