[PATCHv2 3/4] branch: use refs.c:refname_match_patterns()
From: Tom Grennan <hidden>
Date: 2016-06-15 22:53:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Tom Grennan <redacted> --- builtin/branch.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 7095718..7dfc693 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c@@ -266,18 +266,6 @@ struct append_ref_cb { int ret; }; -static int match_patterns(const char **pattern, const char *refname) -{ - if (!*pattern) - return 1; /* no pattern always matches */ - while (*pattern) { - if (!fnmatch(*pattern, refname, 0)) - return 1; - pattern++; - } - return 0; -} - static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
@@ -312,7 +300,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags, if ((kind & ref_list->kinds) == 0) return 0; - if (!match_patterns(cb->pattern, refname)) + if (!refname_match_patterns(cb->pattern, refname)) return 0; commit = NULL;
@@ -542,7 +530,7 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); detached = (detached && (kinds & REF_LOCAL_BRANCH)); - if (detached && match_patterns(pattern, "HEAD")) + if (detached && refname_match_patterns(pattern, "HEAD")) show_detached(&ref_list); for (i = 0; i < ref_list.index; i++) {
--
1.7.8