difftool.c: learn a new way start at specified file

[thirdparty/git.git] / transport.c

diff --git a/transport.c b/transport.c
index 47da955e4fe4548199c28365d3f894bd0b1a81b7..679a35e7c1b6168d3b8fc93f72ec9a50178d894c 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -286,6 +286,8 @@ static struct ref *handshake(struct transport *transport, int for_push,
        struct git_transport_data *data = transport->data;
        struct ref *refs = NULL;
        struct packet_reader reader;
+       int sid_len;
+       const char *server_sid;
 
        connect_setup(transport, for_push);
 
@@ -297,6 +299,8 @@ static struct ref *handshake(struct transport *transport, int for_push,
        data->version = discover_version(&reader);
        switch (data->version) {
        case protocol_v2:
+               if (server_feature_v2("session-id", &server_sid))
+                       trace2_data_string("transfer", NULL, "server-sid", server_sid);
                if (must_list_refs)
                        get_remote_refs(data->fd[1], &reader, &refs, for_push,
                                        ref_prefixes,
@@ -310,6 +314,12 @@ static struct ref *handshake(struct transport *transport, int for_push,
                                 for_push ? REF_NORMAL : 0,
                                 &data->extra_have,
                                 &data->shallow);
+               server_sid = server_feature_value("session-id", &sid_len);
+               if (server_sid) {
+                       char *sid = xstrndup(server_sid, sid_len);
+                       trace2_data_string("transfer", NULL, "server-sid", sid);
+                       free(sid);
+               }
                break;
        case protocol_unknown_version:
                BUG("unknown protocol version");