summaryrefslogtreecommitdiff
path: root/ref-filter.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-10 20:42:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-10 20:42:51 (GMT)
commit0c6435a4d6a45d5947ed4f3a1f63172cdca00d36 (patch)
tree75007f01be703ddbc08de0df1cb48451263dbba2 /ref-filter.c
parent2db87328ef8246b7dbca90563fecc1e67c6274e6 (diff)
parent55d3426929d4d8c3dec402cabe6fb1bf27d6abad (diff)
downloadgit-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 'ref-filter.c')
-rw-r--r--ref-filter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ref-filter.c b/ref-filter.c
index 72e6cb8..e0578d8 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -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;