]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jt/namespaced-ls-refs-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:15 +0000 (14:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:15 +0000 (14:26 -0800)
Fix namespace support in protocol v2.

* jt/namespaced-ls-refs-fix:
  ls-refs: filter refs using namespace-stripped name

1  2 
ls-refs.c
t/t5702-protocol-v2.sh

diff --cc ls-refs.c
index 9c9a7c647f26249d68319786449eefd7d6de1eba,7782bb054b09ff34dc4784185d3eeff6de9c4621..0a7dbc6442fad37fd9e2ce72866b04b134818181
+++ b/ls-refs.c
@@@ -41,10 -40,7 +41,10 @@@ static int send_ref(const char *refname
        const char *refname_nons = strip_namespace(refname);
        struct strbuf refline = STRBUF_INIT;
  
-       if (!ref_match(&data->prefixes, refname))
 +      if (ref_is_hidden(refname_nons, refname))
 +              return 0;
 +
+       if (!ref_match(&data->prefixes, refname_nons))
                return 0;
  
        strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons);
Simple merge