diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-12 20:41:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-12 20:41:36 (GMT) |
| commit | 556ccd4dd2943009270b46b9af443a396bff4dfc (patch) | |
| tree | 9dae6954b6e8d3bfa1eb3050997248d10646fae0 /builtin | |
| parent | 17e4a1b141a4174955dd19131094c3c1cdeb5a8d (diff) | |
| parent | c56c48dd0750dc7759f5e9a33cd4a01d6162b06e (diff) | |
| download | git-556ccd4dd2943009270b46b9af443a396bff4dfc.zip git-556ccd4dd2943009270b46b9af443a396bff4dfc.tar.gz git-556ccd4dd2943009270b46b9af443a396bff4dfc.tar.bz2 | |
Merge branch 'pb/do-not-recurse-grep-no-index'
"git grep --no-index" should not get affected by the contents of
the .gitmodules file but when "--recurse-submodules" is given or
the "submodule.recurse" variable is set, it did. Now these
settings are ignored in the "--no-index" mode.
* pb/do-not-recurse-grep-no-index:
grep: ignore --recurse-submodules if --no-index is given
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/grep.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 50ce8d9..ae2d5bb 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -958,6 +958,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix) /* die the same way as if we did it at the beginning */ setup_git_directory(); } + /* Ignore --recurse-submodules if --no-index is given or implied */ + if (!use_index) + recurse_submodules = 0; /* * skip a -- separator; we know it cannot be @@ -1115,8 +1118,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) } } - if (recurse_submodules && (!use_index || untracked)) - die(_("option not supported with --recurse-submodules")); + if (recurse_submodules && untracked) + die(_("--untracked not supported with --recurse-submodules")); if (!show_in_pager && !opt.status_only) setup_pager(); |