diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:25:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:25:31 +0400 |
| commit | 650c90a18506ce05e2be349d83fe1cef3dc7f8cb (patch) | |
| tree | 6852107d8a2a0d30ea2cfac400fc33bce72fe7bc /builtin/apply.c | |
| parent | 3a66e1bf9c45ac16169c3b6d4a096d5af3ba6929 (diff) | |
| parent | 2c0a1bd616f6d81905c4e8b98e8c9f2d7324924c (diff) | |
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 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index a7e72d57ab..0189523798 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4152,7 +4152,7 @@ static int use_patch(struct patch *p) /* See if it matches any of exclude/include rule */ for (i = 0; i < limit_by_name.nr; i++) { struct string_list_item *it = &limit_by_name.items[i]; - if (!fnmatch(it->string, pathname, 0)) + if (!wildmatch(it->string, pathname, 0, NULL)) return (it->util != NULL); } |