diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 20:42:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 20:42:51 (GMT) |
| commit | 0c6435a4d6a45d5947ed4f3a1f63172cdca00d36 (patch) | |
| tree | 75007f01be703ddbc08de0df1cb48451263dbba2 /dir.c | |
| parent | 2db87328ef8246b7dbca90563fecc1e67c6274e6 (diff) | |
| parent | 55d3426929d4d8c3dec402cabe6fb1bf27d6abad (diff) | |
| download | git-0c6435a4d6a45d5947ed4f3a1f63172cdca00d36.zip git-0c6435a4d6a45d5947ed4f3a1f63172cdca00d36.tar.gz git-0c6435a4d6a45d5947ed4f3a1f63172cdca00d36.tar.bz2 | |
Merge branch 'ab/wildmatch'
Minor code cleanup.
* ab/wildmatch:
wildmatch: remove unused wildopts parameter
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -92,13 +92,11 @@ int git_fnmatch(const struct pathspec_item *item, if (item->magic & PATHSPEC_GLOB) return wildmatch(pattern, string, WM_PATHNAME | - (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0), - NULL); + (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0)); else /* wildmatch has not learned no FNM_PATHNAME mode yet */ return wildmatch(pattern, string, - item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0, - NULL); + item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0); } static int fnmatch_icase_mem(const char *pattern, int patternlen, @@ -122,7 +120,7 @@ static int fnmatch_icase_mem(const char *pattern, int patternlen, if (ignore_case) flags |= WM_CASEFOLD; - match_status = wildmatch(use_pat, use_str, flags, NULL); + match_status = wildmatch(use_pat, use_str, flags); strbuf_release(&pat_buf); strbuf_release(&str_buf); |