From 7a40a95eb4f79517750eb2bcd81342c25c6db406 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 22 Jul 2017 06:39:12 +0200 Subject: [PATCH] refs: use skip_prefix() in ref_is_hidden() This is shorter, makes the logic a bit easier to follow, and is perhaps a bit faster too. The logic is to make the final decision only when "subject" is there, its early part matches "match", and the match is at the slash boundary (or the whole thing). Signed-off-by: Christian Couder Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- refs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index 2d717742d6..dcfa4dee7a 100644 --- a/refs.c +++ b/refs.c @@ -1066,7 +1066,7 @@ int ref_is_hidden(const char *refname, const char *refname_full) const char *match = hide_refs->items[i].string; const char *subject; int neg = 0; - int len; + const char *p; if (*match == '!') { neg = 1; @@ -1081,10 +1081,9 @@ int ref_is_hidden(const char *refname, const char *refname_full) } /* refname can be NULL when namespaces are used. */ - if (!subject || !starts_with(subject, match)) - continue; - len = strlen(match); - if (!subject[len] || subject[len] == '/') + if (subject && + skip_prefix(subject, match, &p) && + (!*p || *p == '/')) return !neg; } return 0;