Merge branch 'ab/wildmatch'

Minor code cleanup.

* ab/wildmatch:
  wildmatch: remove unused wildopts parameter
This commit is contained in:
Junio C Hamano
2017-07-10 13:42:51 -07:00
16 changed files with 22 additions and 29 deletions

View File

@ -1624,7 +1624,7 @@ static int match_pattern(const struct ref_filter *filter, const char *refname)
skip_prefix(refname, "refs/", &refname));
for (; *patterns; patterns++) {
if (!wildmatch(*patterns, refname, flags, NULL))
if (!wildmatch(*patterns, refname, flags))
return 1;
}
return 0;
@ -1655,7 +1655,7 @@ static int match_name_as_path(const struct ref_filter *filter, const char *refna
refname[plen] == '/' ||
p[plen-1] == '/'))
return 1;
if (!wildmatch(p, refname, WM_PATHNAME, NULL))
if (!wildmatch(p, refname, WM_PATHNAME))
return 1;
}
return 0;