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 /builtin/grep.c | |
| parent | 2adb614902ca4dbf085b880ee5bcfea8c2dafb08 (diff) | |
| parent | 557a5998df19faf8641acfc5b6b1c3c2ba64dca9 (diff) | |
| download | git-614ea03a71e6b5281d7fce9f073c091772145047.tar.gz | |
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 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index a70d8e2fba..19e23946ac 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1048,10 +1048,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix) } #endif - if (recurse_submodules) { - gitmodules_config(); - } - if (show_in_pager && (cached || list.nr)) die(_("--open-files-in-pager only works on the worktree")); |