diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-02 23:33:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-02 23:33:47 +0200 |
| commit | dcc6108c3fca6ad3cc4e211a939e8de5c796fa68 (patch) | |
| tree | 0f3d7f86435b4c9a1d2ec356ba5f4898ddb2d16e /submodule-config.h | |
| parent | Git 2.14-rc1 (diff) | |
| parent | grep: recurse in-process using 'struct repository' (diff) | |
| download | git-dcc6108c3fca6ad3cc4e211a939e8de5c796fa68.tar.xz git-dcc6108c3fca6ad3cc4e211a939e8de5c796fa68.zip | |
Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup
* bw/grep-recurse-submodules:
grep: recurse in-process using 'struct repository'
submodule: merge repo_read_gitmodules and gitmodules_config
submodule: check for unmerged .gitmodules outside of config parsing
submodule: check for unstaged .gitmodules outside of config parsing
submodule: remove fetch.recursesubmodules from submodule-config parsing
submodule: remove submodule.fetchjobs from submodule-config parsing
config: add config_from_gitmodules
cache.h: add GITMODULES_FILE macro
repository: have the_repository use the_index
repo_read_index: don't discard the index
Diffstat (limited to 'submodule-config.h')
| -rw-r--r-- | submodule-config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule-config.h b/submodule-config.h index 233bfcb7ff..995d404f88 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -27,6 +27,7 @@ struct repository; extern void submodule_cache_free(struct submodule_cache *cache); +extern int parse_submodule_fetchjobs(const char *var, const char *value); extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); struct option; extern int option_fetch_parse_recurse_submodules(const struct option *opt, |