undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs: use skip_prefix() in ref_is_hidden()

Browse Source 
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 <chriscool@tuxfamily.org>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2017-07-22 06:39:12 +02:00 committed by Junio C Hamano
parent 95d6787973
commit 7a40a95eb4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
refs.c
View File

@ -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 *match = hide_refs->items[i].string;
const char *subject; const char *subject;
int neg = 0; int neg = 0;
int len; const char *p;
if (*match == '!') { if (*match == '!') {
neg = 1; 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. */ /* refname can be NULL when namespaces are used. */
if (!subject || !starts_with(subject, match)) if (subject &&
continue; skip_prefix(subject, match, &p) &&
len = strlen(match); (!*p || *p == '/'))
if (!subject[len] || subject[len] == '/')
return !neg; return !neg;
} }
return 0; return 0;