summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-05-19 10:53:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-19 22:40:26 (GMT)
commitdde72f94bcba8f84f4ea6523b67302df6638c9c0 (patch)
treedae5b8a800c72c2b56a4403566cacb6626aee11c /transport.c
parent04cc91abcbeea60f0ef25c041b412480cd2b1afe (diff)
downloadgit-dde72f94bcba8f84f4ea6523b67302df6638c9c0.zip
git-dde72f94bcba8f84f4ea6523b67302df6638c9c0.tar.gz
git-dde72f94bcba8f84f4ea6523b67302df6638c9c0.tar.bz2
transport: extract common fetch_pack() call
In the switch statement, the difference between the `protocol_v2` and `protocol_v{1,0}` arms is a preparatory call to die_if_server_options() in the latter. The fetch_pack() call is identical in both arms. However, since this fetch_pack() call has so many parameters, it is not immediately obvious that the call is identical in both cases. Extract the common fetch_pack() call out of the switch statement so that code duplication is reduced and the logic is more clear for future readers. While we're at it, rewrite the switch statement as an if-else tower for increased clarity. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/transport.c b/transport.c
index 15f5ba4..431a93c 100644
--- a/transport.c
+++ b/transport.c
@@ -369,24 +369,15 @@ static int fetch_refs_via_pack(struct transport *transport,
refs_tmp = handshake(transport, 0, NULL, must_list_refs);
}
- switch (data->version) {
- case protocol_v2:
- refs = fetch_pack(&args, data->fd,
- refs_tmp ? refs_tmp : transport->remote_refs,
- to_fetch, nr_heads, &data->shallow,
- &transport->pack_lockfile, data->version);
- break;
- case protocol_v1:
- case protocol_v0:
- die_if_server_options(transport);
- refs = fetch_pack(&args, data->fd,
- refs_tmp ? refs_tmp : transport->remote_refs,
- to_fetch, nr_heads, &data->shallow,
- &transport->pack_lockfile, data->version);
- break;
- case protocol_unknown_version:
+ if (data->version == protocol_unknown_version)
BUG("unknown protocol version");
- }
+ else if (data->version <= protocol_v1)
+ die_if_server_options(transport);
+
+ refs = fetch_pack(&args, data->fd,
+ refs_tmp ? refs_tmp : transport->remote_refs,
+ to_fetch, nr_heads, &data->shallow,
+ &transport->pack_lockfile, data->version);
close(data->fd[0]);
close(data->fd[1]);