summaryrefslogtreecommitdiff
path: root/diffcore-order.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-14 21:25:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-14 21:25:31 (GMT)
commit650c90a18506ce05e2be349d83fe1cef3dc7f8cb (patch)
tree6852107d8a2a0d30ea2cfac400fc33bce72fe7bc /diffcore-order.c
parent3a66e1bf9c45ac16169c3b6d4a096d5af3ba6929 (diff)
parent2c0a1bd616f6d81905c4e8b98e8c9f2d7324924c (diff)
downloadgit-650c90a18506ce05e2be349d83fe1cef3dc7f8cb.zip
git-650c90a18506ce05e2be349d83fe1cef3dc7f8cb.tar.gz
git-650c90a18506ce05e2be349d83fe1cef3dc7f8cb.tar.bz2
Merge branch 'nd/no-more-fnmatch'
We started using wildmatch() in place of fnmatch(3); complete the process and stop using fnmatch(3). * nd/no-more-fnmatch: actually remove compat fnmatch source code stop using fnmatch (either native or compat) Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch" use wildmatch() directly without fnmatch() wrapper
Diffstat (limited to 'diffcore-order.c')
-rw-r--r--diffcore-order.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore-order.c b/diffcore-order.c
index 1bfcc39..97dd3d0 100644
--- a/diffcore-order.c
+++ b/diffcore-order.c
@@ -67,7 +67,7 @@ static int match_order(const char *path)
strbuf_addstr(&p, path);
while (p.buf[0]) {
char *cp;
- if (!fnmatch(order[i], p.buf, 0))
+ if (!wildmatch(order[i], p.buf, 0, NULL))
return i;
cp = strrchr(p.buf, '/');
if (!cp)