зеркало из https://github.com/microsoft/git.git
Merge branch 'cc/ref-is-hidden-microcleanup' into maint
Code cleanup. * cc/ref-is-hidden-microcleanup: refs: use skip_prefix() in ref_is_hidden()
This commit is contained in:
Коммит
d0dffcacf3
9
refs.c
9
refs.c
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче