diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-01-14 16:23:22 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-14 18:39:04 -0800 |
| commit | 8c69c1f92eb79a597225814781fdf1ab4be26758 (patch) | |
| tree | e72d3934616105496df528e38379931ff6ffcb91 | |
| parent | 6db5c6e43dccb380ca6e9947777985eb11248c31 (diff) | |
| download | git-8c69c1f92eb79a597225814781fdf1ab4be26758.tar.gz | |
Document limited recursion pathspec matching with wildcards
It's actually unlimited recursion if wildcards are active regardless
--max-depth
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-grep.txt | 3 | ||||
| -rw-r--r-- | tree-walk.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 15d6711d46..6a8b1e3a7d 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -79,6 +79,9 @@ OPTIONS --max-depth <depth>:: For each <pathspec> given on command line, descend at most <depth> levels of directories. A negative value means no limit. + This option is ignored if <pathspec> contains active wildcards. + In other words if "a*" matches a directory named "a*", + "*" is matched literally so --max-depth is still effective. -w:: --word-regexp:: diff --git a/tree-walk.c b/tree-walk.c index f82dba6a1f..492c7cd744 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -661,6 +661,9 @@ match_wildcards: /* * Match all directories. We'll try to match files * later on. + * max_depth is ignored but we may consider support it + * in future, see + * http://thread.gmane.org/gmane.comp.version-control.git/163757/focus=163840 */ if (ps->recursive && S_ISDIR(entry->mode)) return entry_interesting; |