mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-21 08:32:02 +02:00
Code

Merge branch 'cc/ref-is-hidden-microcleanup' into maint

Browse Source 
Code cleanup.

* cc/ref-is-hidden-microcleanup:
  refs: use skip_prefix() in ref_is_hidden()
This commit is contained in:
Junio C Hamano 2017-08-23 14:33:50 -07:00
commit d0dffcacf3
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

@ -1160,7 +1160,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;
@ -1175,10 +1175,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;