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>

diff --git a/refs.c b/refs.c
index 8659c3eff70d30e4ddf7b068faef563703bff886..1f6890bf486fcb3b9022ab55f35aa63edbe56bab 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -51,7 +51,7 @@ static int check_refname_component(const char *refname, int flags)
                last = ch;
        }
        if (cp == refname)
                last = ch;
        }
        if (cp == refname)

-               return -1; /* Component has zero length. */
+               return 0; /* Component has zero length. */

        if (refname[0] == '.') {
                if (!(flags & REFNAME_DOT_COMPONENT))
                        return -1; /* Component starts with '.'. */
        if (refname[0] == '.') {
                if (!(flags & REFNAME_DOT_COMPONENT))
                        return -1; /* Component starts with '.'. */


@@ -74,7 +74,7 @@ int check_refname_format(const char *refname, int flags)
        while (1) {
                /* We are at the start of a path component. */
                component_len = check_refname_component(refname, flags);
        while (1) {
                /* We are at the start of a path component. */
                component_len = check_refname_component(refname, flags);

-               if (component_len < 0) {
+               if (component_len <= 0) {

                        if ((flags & REFNAME_REFSPEC_PATTERN) &&
                                        refname[0] == '*' &&
                                        (refname[1] == '\0' || refname[1] == '/')) {
                        if ((flags & REFNAME_REFSPEC_PATTERN) &&
                                        refname[0] == '*' &&
                                        (refname[1] == '\0' || refname[1] == '/')) {