diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 22:20:31 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 22:20:31 +0300 |
commit | b9632c9d95f601c3d557cdbad60c06fcc7d30110 (patch) | |
tree | be604c30d9bfc2ef04d9fd0484dd108326e90519 /builtin/fetch.c | |
parent | d18602f4123ad61b094aff5b2822774cf020e70e (diff) | |
parent | db64d1127f5c76b721830ba390176cf0d6e59d74 (diff) |
Merge branch 'ao/config-from-gitmodules'
Tighten the API to make it harder to misuse in-tree .gitmodules
file, even though it shares the same syntax with configuration
files, to read random configuration items from it.
* ao/config-from-gitmodules:
submodule-config: reuse config_from_gitmodules in repo_read_gitmodules
submodule-config: pass repository as argument to config_from_gitmodules
submodule-config: make 'config_from_gitmodules' private
submodule-config: add helper to get 'update-clone' config from .gitmodules
submodule-config: add helper function to get 'fetch' config from .gitmodules
config: move config_from_gitmodules to submodule-config.c
Diffstat (limited to 'builtin/fetch.c')
-rw-r--r-- | builtin/fetch.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 83f36d7cde..d9bb72bf49 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -94,19 +94,6 @@ static int git_fetch_config(const char *k, const char *v, void *cb) return git_default_config(k, v, cb); } -static int gitmodules_fetch_config(const char *var, const char *value, void *cb) -{ - if (!strcmp(var, "submodule.fetchjobs")) { - max_children = parse_submodule_fetchjobs(var, value); - return 0; - } else if (!strcmp(var, "fetch.recursesubmodules")) { - recurse_submodules = parse_fetch_recurse_submodules_arg(var, value); - return 0; - } - - return 0; -} - static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) { /* @@ -1434,7 +1421,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) for (i = 1; i < argc; i++) strbuf_addf(&default_rla, " %s", argv[i]); - config_from_gitmodules(gitmodules_fetch_config, NULL); + fetch_config_from_gitmodules(&max_children, &recurse_submodules); git_config(git_fetch_config, NULL); argc = parse_options(argc, argv, prefix, |