check_refname_component(): return 0 for zero-length components
Return 0 (instead of -1) for zero-length components. Move the interpretation of zero-length components as illegal to check_refname_format(). This will make it easier to extend check_refname_format() to also check whether directory names are valid. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
732134edab
commit
dac529e44f
4
refs.c
4
refs.c
|
@ -51,7 +51,7 @@ static int check_refname_component(const char *refname, int flags)
|
||||||
last = ch;
|
last = ch;
|
||||||
}
|
}
|
||||||
if (cp == refname)
|
if (cp == refname)
|
||||||
return -1; /* Component has zero length. */
|
return 0; /* Component has zero length. */
|
||||||
if (refname[0] == '.') {
|
if (refname[0] == '.') {
|
||||||
if (!(flags & REFNAME_DOT_COMPONENT))
|
if (!(flags & REFNAME_DOT_COMPONENT))
|
||||||
return -1; /* Component starts with '.'. */
|
return -1; /* Component starts with '.'. */
|
||||||
|
@ -74,7 +74,7 @@ int check_refname_format(const char *refname, int flags)
|
||||||
while (1) {
|
while (1) {
|
||||||
/* We are at the start of a path component. */
|
/* We are at the start of a path component. */
|
||||||
component_len = check_refname_component(refname, flags);
|
component_len = check_refname_component(refname, flags);
|
||||||
if (component_len < 0) {
|
if (component_len <= 0) {
|
||||||
if ((flags & REFNAME_REFSPEC_PATTERN) &&
|
if ((flags & REFNAME_REFSPEC_PATTERN) &&
|
||||||
refname[0] == '*' &&
|
refname[0] == '*' &&
|
||||||
(refname[1] == '\0' || refname[1] == '/')) {
|
(refname[1] == '\0' || refname[1] == '/')) {
|
||||||
|
|
Loading…
Reference in New Issue