upload-pack: strip refs before calling ref_is_hidden()

Make hideRefs handling in upload-pack consistent with the behavior
described in the documentation by stripping refs before comparing them
with prefixes in hideRefs.

Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/upload-pack.c b/upload-pack.c
index d0bc3ca07ab1b005884c80901ea8dee04452b71a..4ca960ec9dc1966d735f908b41a1793a7eb36ae0 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -692,7 +692,7 @@ static int mark_our_ref(const char *refname, const struct object_id *oid)
 {
        struct object *o = lookup_unknown_object(oid->hash);
 
 {
        struct object *o = lookup_unknown_object(oid->hash);
 

-       if (ref_is_hidden(refname)) {
+       if (refname && ref_is_hidden(refname)) {

                o->flags |= HIDDEN_REF;
                return 1;
        }
                o->flags |= HIDDEN_REF;
                return 1;
        }


@@ -703,7 +703,7 @@ static int mark_our_ref(const char *refname, const struct object_id *oid)
 static int check_ref(const char *refname, const struct object_id *oid,
                     int flag, void *cb_data)
 {
 static int check_ref(const char *refname, const struct object_id *oid,
                     int flag, void *cb_data)
 {

-       mark_our_ref(refname, oid);
+       mark_our_ref(strip_namespace(refname), oid);

        return 0;
 }
 
        return 0;
 }
 


@@ -726,7 +726,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
        const char *refname_nons = strip_namespace(refname);
        struct object_id peeled;
 
        const char *refname_nons = strip_namespace(refname);
        struct object_id peeled;
 

-       if (mark_our_ref(refname, oid))
+       if (mark_our_ref(refname_nons, oid))

                return 0;
 
        if (capabilities) {
                return 0;
 
        if (capabilities) {