Merge branch 'nd/include-if-wildmatch'

A buglet in configuration parser has been fixed.

* nd/include-if-wildmatch:
  config: correct '**' matching in includeIf patterns
This commit is contained in:
Junio C Hamano
2019-04-22 11:14:45 +09:00
2 changed files with 14 additions and 1 deletions

View File

@ -242,7 +242,7 @@ again:
}
ret = !wildmatch(pattern.buf + prefix, text.buf + prefix,
icase ? WM_CASEFOLD : 0);
WM_PATHNAME | (icase ? WM_CASEFOLD : 0));
if (!ret && !already_tried_absolute) {
/*