mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bw/pathspec-match-submodule-boundary'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2017-12-19 11:33:56 -08:00
parent d7c6c2369a eef3df5a93
commit f4f233e13d
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tree-walk.c
View File

@ -1011,7 +1011,8 @@ static enum interesting do_match(const struct name_entry *entry,
* character. More accurate matching can then
* be performed in the submodule itself.
*/
if (ps->recursive && S_ISGITLINK(entry->mode) &&
if (ps->recurse_submodules &&
S_ISGITLINK(entry->mode) &&
!ps_strncmp(item, match + baselen,
entry->path,
item->nowildcard_len - baselen))
@ -1060,7 +1061,7 @@ match_wildcards:
* character. More accurate matching can then
* be performed in the submodule itself.
*/
if (ps->recursive && S_ISGITLINK(entry->mode) &&
if (ps->recurse_submodules && S_ISGITLINK(entry->mode) &&
!ps_strncmp(item, match, base->buf + base_offset,
item->nowildcard_len)) {
strbuf_setlen(base, base_offset + baselen);