summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-22 02:14:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-22 02:14:46 (GMT)
commit078b254deb62d86c469c87ba4200c5a46fcb3a95 (patch)
tree445a5f8556bba93f72180bc867167e9f3f6af17e /config.c
parent6b42805445c3b5714c100ac066697943f2571fd3 (diff)
parent19e7fdaa582598fb915e0a421a14b559c06587fd (diff)
downloadgit-078b254deb62d86c469c87ba4200c5a46fcb3a95.zip
git-078b254deb62d86c469c87ba4200c5a46fcb3a95.tar.gz
git-078b254deb62d86c469c87ba4200c5a46fcb3a95.tar.bz2
Merge branch 'nd/include-if-wildmatch'
A buglet in configuration parser has been fixed. * nd/include-if-wildmatch: config: correct '**' matching in includeIf patterns
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index 0f0cdd8..c2846df 100644
--- a/config.c
+++ b/config.c
@@ -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) {
/*