ls-remote: pass ref prefixes when requesting a remote's refs

diff --git a/transport.c b/transport.c
index 2378dcb38c0334936f013199563851a60ec9a2d8..3f130518d2ba79a1f7ba9d96c0db04f6b97e50c8 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -72,7 +72,9 @@ struct bundle_transport_data {
        struct bundle_header header;
 };
 
-static struct ref *get_refs_from_bundle(struct transport *transport, int for_push)
+static struct ref *get_refs_from_bundle(struct transport *transport,
+                                       int for_push,
+                                       const struct argv_array *ref_prefixes)
 {
        struct bundle_transport_data *data = transport->data;
        struct ref *result = NULL;
@@ -189,7 +191,8 @@ static int connect_setup(struct transport *transport, int for_push)
        return 0;
 }
 
-static struct ref *get_refs_via_connect(struct transport *transport, int for_push)
+static struct ref *get_refs_via_connect(struct transport *transport, int for_push,
+                                       const struct argv_array *ref_prefixes)
 {
        struct git_transport_data *data = transport->data;
        struct ref *refs = NULL;
@@ -203,6 +206,10 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
 
        data->version = discover_version(&reader);
        switch (data->version) {
+       case protocol_v2:
+               get_remote_refs(data->fd[1], &reader, &refs, for_push,
+                               ref_prefixes);
+               break;
        case protocol_v1:
        case protocol_v0:
                get_remote_heads(&reader, &refs,
@@ -247,9 +254,12 @@ static int fetch_refs_via_pack(struct transport *transport,
        args.update_shallow = data->options.update_shallow;
 
        if (!data->got_remote_heads)
-               refs_tmp = get_refs_via_connect(transport, 0);
+               refs_tmp = get_refs_via_connect(transport, 0, NULL);
 
        switch (data->version) {
+       case protocol_v2:
+               die("support for protocol v2 not implemented yet");
+               break;
        case protocol_v1:
        case protocol_v0:
                refs = fetch_pack(&args, data->fd, data->conn,
@@ -562,7 +572,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
        int ret = 0;
 
        if (!data->got_remote_heads)
-               get_refs_via_connect(transport, 1);
+               get_refs_via_connect(transport, 1, NULL);
 
        memset(&args, 0, sizeof(args));
        args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR);
@@ -585,6 +595,9 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
                args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
 
        switch (data->version) {
+       case protocol_v2:
+               die("support for protocol v2 not implemented yet");
+               break;
        case protocol_v1:
        case protocol_v0:
                ret = send_pack(&args, data->fd, data->conn, remote_refs,
@@ -1019,7 +1032,7 @@ int transport_push(struct transport *transport,
                if (check_push_refs(local_refs, refspec_nr, refspec) < 0)
                        return -1;
 
-               remote_refs = transport->vtable->get_refs_list(transport, 1);
+               remote_refs = transport->vtable->get_refs_list(transport, 1, NULL);
 
                if (flags & TRANSPORT_PUSH_ALL)
                        match_flags |= MATCH_REFS_ALL;
@@ -1125,10 +1138,13 @@ int transport_push(struct transport *transport,
        return 1;
 }
 
-const struct ref *transport_get_remote_refs(struct transport *transport)
+const struct ref *transport_get_remote_refs(struct transport *transport,
+                                           const struct argv_array *ref_prefixes)
 {
        if (!transport->got_remote_refs) {
-               transport->remote_refs = transport->vtable->get_refs_list(transport, 0);
+               transport->remote_refs =
+                       transport->vtable->get_refs_list(transport, 0,
+                                                        ref_prefixes);
                transport->got_remote_refs = 1;
        }