parse-options: new option type to treat an option-like parameter as an argument.

diff --git a/transport.c b/transport.c
index 199e9e6a0dbde490b60fd2befd29634905e962dd..0a5cf0a9c29c34a7f0fd0d53a5f6472ab2f2fa4f 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -441,11 +441,12 @@ static struct ref *get_refs_via_curl(struct transport *transport)
        struct ref *ref = NULL;
        struct ref *last_ref = NULL;
 
+       if (!transport->data)
+               transport->data = get_http_walker(transport->url);
+
        refs_url = xmalloc(strlen(transport->url) + 11);
        sprintf(refs_url, "%s/info/refs", transport->url);
 
-       http_init();
-
        slot = get_active_slot();
        slot->results = &results;
        curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
@@ -473,8 +474,6 @@ static struct ref *get_refs_via_curl(struct transport *transport)
                return NULL;
        }
 
-       http_cleanup();
-
        data = buffer.buf;
        start = NULL;
        mid = data;
@@ -623,6 +622,7 @@ static int fetch_refs_via_pack(struct transport *transport,
        char *dest = xstrdup(transport->url);
        struct fetch_pack_args args;
        int i;
+       struct ref *refs_tmp = NULL;
 
        memset(&args, 0, sizeof(args));
        args.uploadpack = data->uploadpack;
@@ -635,15 +635,13 @@ static int fetch_refs_via_pack(struct transport *transport,
        for (i = 0; i < nr_heads; i++)
                origh[i] = heads[i] = xstrdup(to_fetch[i]->name);
 
-       refs = transport_get_remote_refs(transport);
        if (!data->conn) {
-               struct ref *refs_tmp;
                connect_setup(transport);
                get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0);
-               free_refs(refs_tmp);
        }
 
-       refs = fetch_pack(&args, data->fd, data->conn, transport->remote_refs,
+       refs = fetch_pack(&args, data->fd, data->conn,
+                         refs_tmp ? refs_tmp : transport->remote_refs,
                          dest, nr_heads, heads, &transport->pack_lockfile);
        close(data->fd[0]);
        close(data->fd[1]);
@@ -651,6 +649,8 @@ static int fetch_refs_via_pack(struct transport *transport,
                refs = NULL;
        data->conn = NULL;
 
+       free_refs(refs_tmp);
+
        for (i = 0; i < nr_heads; i++)
                free(origh[i]);
        free(origh);