Merge branch 'js/test-unset-prereq'

diff --git a/transport.c b/transport.c
index 37410d8aad9dd70df282c133ea9939bba5589efd..2c4de32b3335312a4ba8c79e82606d1b8339570b 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -268,7 +268,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
        switch (data->version) {
        case protocol_v2:
                get_remote_refs(data->fd[1], &reader, &refs, for_push,
-                               ref_prefixes);
+                               ref_prefixes, transport->server_options);
                break;
        case protocol_v1:
        case protocol_v0:
@@ -316,6 +316,7 @@ static int fetch_refs_via_pack(struct transport *transport,
        args.no_dependents = data->options.no_dependents;
        args.filter_options = data->options.filter_options;
        args.stateless_rpc = transport->stateless_rpc;
+       args.server_options = transport->server_options;
 
        if (!data->got_remote_heads)
                refs_tmp = get_refs_via_connect(transport, 0, NULL);