diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 20:33:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 20:33:56 +0100 |
| commit | f4f233e13daa584e5178141eb10e6e9527a3454c (patch) | |
| tree | 2705e845567749c51ba409d303502f5d4e576188 /builtin/grep.c | |
| parent | Merge branch 'jt/diff-anchored-patience' (diff) | |
| parent | pathspec: only match across submodule boundaries when requested (diff) | |
| download | git-f4f233e13daa584e5178141eb10e6e9527a3454c.tar.xz git-f4f233e13daa584e5178141eb10e6e9527a3454c.zip | |
Merge branch 'bw/pathspec-match-submodule-boundary'
An v2.12-era regression in pathspec match logic, which made it look
into submodule tree even when it is not desired, has been fixed.
* bw/pathspec-match-submodule-boundary:
pathspec: only match across submodule boundaries when requested
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 5a6cfe6b45..3ca4ac80d8 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1015,6 +1015,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) prefix, argv + i); pathspec.max_depth = opt.max_depth; pathspec.recursive = 1; + pathspec.recurse_submodules = !!recurse_submodules; #ifndef NO_PTHREADS if (list.nr || cached || show_in_pager) |