Merge branch 'jt/avoid-ls-refs-with-http'

[thirdparty/git.git] / transport-helper.c

diff --git a/transport-helper.c b/transport-helper.c
index 31691117725acacfb0069ce002eec844bc2ac52a..9e1279b928bb3eadf110e43c091b4a3ba789fe3b 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -33,6 +33,16 @@ struct helper_data {
                check_connectivity : 1,
                no_disconnect_req : 1,
                no_private_update : 1;
+
+       /*
+        * As an optimization, the transport code may invoke fetch before
+        * get_refs_list. If this happens, and if the transport helper doesn't
+        * support connect or stateless_connect, we need to invoke
+        * get_refs_list ourselves if we haven't already done so. Keep track of
+        * whether we have invoked get_refs_list.
+        */
+       unsigned get_refs_list_called : 1;
+
        char *export_marks;
        char *import_marks;
        /* These go from remote name (as in "list") to private name */
@@ -652,17 +662,25 @@ static int connect_helper(struct transport *transport, const char *name,
        return 0;
 }
 
+static struct ref *get_refs_list_using_list(struct transport *transport,
+                                           int for_push);
+
 static int fetch(struct transport *transport,
                 int nr_heads, struct ref **to_fetch)
 {
        struct helper_data *data = transport->data;
        int i, count;
 
+       get_helper(transport);
+
        if (process_connect(transport, 0)) {
                do_take_over(transport);
                return transport->vtable->fetch(transport, nr_heads, to_fetch);
        }
 
+       if (!data->get_refs_list_called)
+               get_refs_list_using_list(transport, 0);
+
        count = 0;
        for (i = 0; i < nr_heads; i++)
                if (!(to_fetch[i]->status & REF_STATUS_UPTODATE))
@@ -1054,6 +1072,19 @@ static int has_attribute(const char *attrs, const char *attr)
 
 static struct ref *get_refs_list(struct transport *transport, int for_push,
                                 const struct argv_array *ref_prefixes)
+{
+       get_helper(transport);
+
+       if (process_connect(transport, for_push)) {
+               do_take_over(transport);
+               return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
+       }
+
+       return get_refs_list_using_list(transport, for_push);
+}
+
+static struct ref *get_refs_list_using_list(struct transport *transport,
+                                           int for_push)
 {
        struct helper_data *data = transport->data;
        struct child_process *helper;
@@ -1062,13 +1093,9 @@ static struct ref *get_refs_list(struct transport *transport, int for_push,
        struct ref *posn;
        struct strbuf buf = STRBUF_INIT;
 
+       data->get_refs_list_called = 1;
        helper = get_helper(transport);
 
-       if (process_connect(transport, for_push)) {
-               do_take_over(transport);
-               return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
-       }
-
        if (data->push && for_push)
                write_str_in_full(helper->in, "list for-push\n");
        else
@@ -1115,7 +1142,6 @@ static struct ref *get_refs_list(struct transport *transport, int for_push,
 }
 
 static struct transport_vtable vtable = {
-       0,
        set_helper_option,
        get_refs_list,
        fetch,