t1405: check for_each_reflog_ent_reverse() more thoroughly

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

diff --git a/transport-helper.c b/transport-helper.c
index 4be035edb8b7c6d618b4dc78ea5de203a2831391..a0297b0986c62e7a6e8f8951071ed5ea9da2640b 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -671,8 +671,8 @@ static int connect_helper(struct transport *transport, const char *name,
 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)
+static int fetch_refs(struct transport *transport,
+                     int nr_heads, struct ref **to_fetch)
 {
        struct helper_data *data = transport->data;
        int i, count;
@@ -681,7 +681,7 @@ static int fetch(struct transport *transport,
 
        if (process_connect(transport, 0)) {
                do_take_over(transport);
-               return transport->vtable->fetch(transport, nr_heads, to_fetch);
+               return transport->vtable->fetch_refs(transport, nr_heads, to_fetch);
        }
 
        /*
@@ -845,6 +845,10 @@ static int push_update_ref_status(struct strbuf *buf,
                        forced = 1;
                        FREE_AND_NULL(msg);
                }
+               else if (!strcmp(msg, "expecting report")) {
+                       status = REF_STATUS_EXPECTING_REPORT;
+                       FREE_AND_NULL(msg);
+               }
        }
 
        if (state->hint)
@@ -1261,12 +1265,12 @@ static struct ref *get_refs_list_using_list(struct transport *transport,
 }
 
 static struct transport_vtable vtable = {
-       set_helper_option,
-       get_refs_list,
-       fetch,
-       push_refs,
-       connect_helper,
-       release_helper
+       .set_option     = set_helper_option,
+       .get_refs_list  = get_refs_list,
+       .fetch_refs     = fetch_refs,
+       .push_refs      = push_refs,
+       .connect        = connect_helper,
+       .disconnect     = release_helper
 };
 
 int transport_helper_init(struct transport *transport, const char *name)