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 /pathspec.h | |
| 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 'pathspec.h')
| -rw-r--r-- | pathspec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pathspec.h b/pathspec.h index 6420d1080a..099a170c2e 100644 --- a/pathspec.h +++ b/pathspec.h @@ -24,6 +24,7 @@ struct pathspec { int nr; unsigned int has_wildcard:1; unsigned int recursive:1; + unsigned int recurse_submodules:1; unsigned magic; int max_depth; struct pathspec_item { |