summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-13 13:47:07 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-13 13:47:07 -0700
commit3c548de3788eda31388b435d8983866fe43e032f (patch)
treeebc1325a891abcf3fac7dcdf04c86c077a1d76a4 /submodule.h
parent93dd544f54ea596e9d70d06c100123c10689861c (diff)
parent58f4203e7db265cd2d8315ca5d9c9979cd577427 (diff)
downloadgit-3c548de3788eda31388b435d8983866fe43e032f.tar.gz
Merge branch 'sb/submodule-blanket-recursive'
Many commands learned to pay attention to submodule.recurse configuration. * sb/submodule-blanket-recursive: builtin/fetch.c: respect 'submodule.recurse' option builtin/push.c: respect 'submodule.recurse' option builtin/grep.c: respect 'submodule.recurse' option Introduce 'submodule.recurse' option for worktree manipulators submodule loading: separate code path for .gitmodules and config overlay reset/checkout/read-tree: unify config callback for submodule recursion submodule test invocation: only pass additional arguments submodule recursing: do not write a config variable twice
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h
index 8fb0f25498..cbe5c1726f 100644
--- a/submodule.h
+++ b/submodule.h
@@ -39,6 +39,12 @@ extern void stage_updated_gitmodules(void);
extern void set_diffopt_flags_from_submodule_config(struct diff_options *,
const char *path);
extern int submodule_config(const char *var, const char *value, void *cb);
+extern int git_default_submodule_config(const char *var, const char *value, void *cb);
+
+struct option;
+int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
+ const char *arg, int unset);
+void load_submodule_cache(void);
extern void gitmodules_config(void);
extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
extern int is_submodule_initialized(const char *path);
@@ -69,7 +75,6 @@ extern void show_submodule_inline_diff(FILE *f, const char *path,
const char *del, const char *add, const char *reset,
const struct diff_options *opt);
extern void set_config_fetch_recurse_submodules(int value);
-extern void set_config_update_recurse_submodules(int value);
/* Check if we want to update any submodule.*/
extern int should_update_submodules(void);
/*