transport: store protocol version
Once protocol_v2 is introduced requesting a fetch or a push will need to be handled differently depending on the protocol version. Store the protocol version the server is speaking in 'struct git_transport_data' and use it to determine what to do in the case of a fetch or a push. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
Mar 14, 2018 at 11:31 UTC
432e95651031025e421ae2f521f7c0d9f60c527c
1 file changed
+26
-9
transport.c
+26
-9
@@ -118,6 +118,7 @@ struct git_transport_data {
118
struct child_process *conn;
119
int fd[2];
120
unsigned got_remote_heads : 1;
121
+ enum protocol_version version;
122
struct oid_array extra_have;
123
struct oid_array shallow;
124
};
@@ -200,7 +201,8 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
201
PACKET_READ_CHOMP_NEWLINE |
202
PACKET_READ_GENTLE_ON_EOF);
203
203
- switch (discover_version(&reader)) {
204
+ data->version = discover_version(&reader);
205
+ switch (data->version) {
206
case protocol_v1:
207
case protocol_v0:
208
get_remote_heads(&reader, &refs,
@@ -221,7 +223,7 @@ static int fetch_refs_via_pack(struct transport *transport,
223
{
224
int ret = 0;
225
struct git_transport_data *data = transport->data;
224
- struct ref *refs;
226
+ struct ref *refs = NULL;
227
char *dest = xstrdup(transport->url);
228
struct fetch_pack_args args;
229
struct ref *refs_tmp = NULL;
@@ -247,10 +249,18 @@ static int fetch_refs_via_pack(struct transport *transport,
249
if (!data->got_remote_heads)
250
refs_tmp = get_refs_via_connect(transport, 0);
251
250
- refs = fetch_pack(&args, data->fd, data->conn,
251
- refs_tmp ? refs_tmp : transport->remote_refs,
252
- dest, to_fetch, nr_heads, &data->shallow,
253
- &transport->pack_lockfile);
252
+ switch (data->version) {
253
+ case protocol_v1:
254
+ case protocol_v0:
255
+ refs = fetch_pack(&args, data->fd, data->conn,
256
+ refs_tmp ? refs_tmp : transport->remote_refs,
257
+ dest, to_fetch, nr_heads, &data->shallow,
258
+ &transport->pack_lockfile);
259
+ break;
260
+ case protocol_unknown_version:
261
+ BUG("unknown protocol version");
262
+ }
263
+
264
close(data->fd[0]);
265
close(data->fd[1]);
266
if (finish_connect(data->conn))
@@ -549,7 +559,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
559
{
560
struct git_transport_data *data = transport->data;
561
struct send_pack_args args;
552
- int ret;
562
+ int ret = 0;
563
564
if (!data->got_remote_heads)
565
get_refs_via_connect(transport, 1);
@@ -574,8 +584,15 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
584
else
585
args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
586
577
- ret = send_pack(&args, data->fd, data->conn, remote_refs,
578
- &data->extra_have);
587
+ switch (data->version) {
588
+ case protocol_v1:
589
+ case protocol_v0:
590
+ ret = send_pack(&args, data->fd, data->conn, remote_refs,
591
+ &data->extra_have);
592
+ break;
593
+ case protocol_unknown_version:
594
+ BUG("unknown protocol version");
595
+ }
596
597
close(data->fd[1]);
598
close(data->fd[0]);