summaryrefslogtreecommitdiff
path: root/builtin/fetch.c
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 /builtin/fetch.c
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 'builtin/fetch.c')
-rw-r--r--builtin/fetch.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 47708451bc..100248c5af 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -73,6 +73,13 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
fetch_prune_config = git_config_bool(k, v);
return 0;
}
+
+ if (!strcmp(k, "submodule.recurse")) {
+ int r = git_config_bool(k, v) ?
+ RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
+ recurse_submodules = r;
+ }
+
return git_default_config(k, v, cb);
}