diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:47:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:47:07 -0700 |
| commit | 3c548de3788eda31388b435d8983866fe43e032f (patch) | |
| tree | ebc1325a891abcf3fac7dcdf04c86c077a1d76a4 /builtin/grep.c | |
| parent | 93dd544f54ea596e9d70d06c100123c10689861c (diff) | |
| parent | 58f4203e7db265cd2d8315ca5d9c9979cd577427 (diff) | |
| download | git-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/grep.c')
| -rw-r--r-- | builtin/grep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 7df9c253ee..d188871556 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -302,6 +302,9 @@ static int grep_cmd_config(const char *var, const char *value, void *cb) #endif } + if (!strcmp(var, "submodule.recurse")) + recurse_submodules = git_config_bool(var, value); + return st; } |