diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:08 -0700 |
| commit | 614ea03a71e6b5281d7fce9f073c091772145047 (patch) | |
| tree | dfe5f0632a92d2da1d0457dc8e5824ef8f065829 /submodule-config.h | |
| parent | Merge branch 'js/gitweb-raw-blob-link-in-history' (diff) | |
| parent | submodule: remove gitmodules_config (diff) | |
| download | tgif-614ea03a71e6b5281d7fce9f073c091772145047.tar.xz | |
Merge branch 'bw/submodule-config-cleanup'
Code clean-up to avoid mixing values read from the .gitmodules file
and values read from the .git/config file.
* bw/submodule-config-cleanup:
submodule: remove gitmodules_config
unpack-trees: improve loading of .gitmodules
submodule-config: lazy-load a repository's .gitmodules file
submodule-config: move submodule-config functions to submodule-config.c
submodule-config: remove support for overlaying repository config
diff: stop allowing diff to have submodules configured in .git/config
submodule: remove submodule_config callback routine
unpack-trees: don't respect submodule.update
submodule: don't rely on overlayed config when setting diffopts
fetch: don't overlay config with submodule-config
submodule--helper: don't overlay config in update-clone
submodule--helper: don't overlay config in remote_submodule_branch
add, reset: ensure submodules can be added or reset
submodule: don't use submodule_from_name
t7411: check configuration parsing errors
Diffstat (limited to 'submodule-config.h')
| -rw-r--r-- | submodule-config.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/submodule-config.h b/submodule-config.h index cccd34b929..e3845831f6 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -34,9 +34,8 @@ extern int option_fetch_parse_recurse_submodules(const struct option *opt, const char *arg, int unset); extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg); extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg); -extern int parse_submodule_config_option(const char *var, const char *value); -extern int submodule_config_option(struct repository *repo, - const char *var, const char *value); +extern void repo_read_gitmodules(struct repository *repo); +extern void gitmodules_config_oid(const struct object_id *commit_oid); extern const struct submodule *submodule_from_name( const struct object_id *commit_or_tree, const char *name); extern const struct submodule *submodule_from_path( @@ -44,9 +43,6 @@ extern const struct submodule *submodule_from_path( extern const struct submodule *submodule_from_cache(struct repository *repo, const struct object_id *treeish_name, const char *key); -extern int gitmodule_oid_from_commit(const struct object_id *commit_oid, - struct object_id *gitmodules_oid, - struct strbuf *rev); extern void submodule_free(void); #endif /* SUBMODULE_CONFIG_H */ |