summaryrefslogtreecommitdiff
path: root/builtin/fetch-pack.c
diff options
context:
space:
mode:
authorMasaya Suzuki <masayasuzuki@google.com>2018-12-29 21:19:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-02 21:05:30 (GMT)
commit2d103c31c2cfcf03ff1408d639043469b0c93f70 (patch)
tree17a4e7a35fb5401fad2b8713e17360af0573682e /builtin/fetch-pack.c
parent01f9ec64c8a82a05ba7e5a17b292ede037a469ea (diff)
downloadgit-2d103c31c2cfcf03ff1408d639043469b0c93f70.zip
git-2d103c31c2cfcf03ff1408d639043469b0c93f70.tar.gz
git-2d103c31c2cfcf03ff1408d639043469b0c93f70.tar.bz2
pack-protocol.txt: accept error packets in any context
In the Git pack protocol definition, an error packet may appear only in a certain context. However, servers can face a runtime error (e.g. I/O error) at an arbitrary timing. This patch changes the protocol to allow an error packet to be sent instead of any packet. Without this protocol spec change, when a server cannot process a request, there's no way to tell that to a client. Since the server cannot produce a valid response, it would be forced to cut a connection without telling why. With this protocol spec change, the server can be more gentle in this situation. An old client may see these error packets as an unexpected packet, but this is not worse than having an unexpected EOF. Following this protocol spec change, the error packet handling code is moved to pkt-line.c. Implementation wise, this implementation uses pkt-line to communicate with a subprocess. Since this is not a part of Git protocol, it's possible that a packet that is not supposed to be an error packet is mistakenly parsed as an error packet. This error packet handling is enabled only for the Git pack protocol parsing code considering this. Signed-off-by: Masaya Suzuki <masayasuzuki@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fetch-pack.c')
-rw-r--r--builtin/fetch-pack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 63e69a5..85dbc2a 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -217,7 +217,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
packet_reader_init(&reader, fd[0], NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
- PACKET_READ_GENTLE_ON_EOF);
+ PACKET_READ_GENTLE_ON_EOF |
+ PACKET_READ_DIE_ON_ERR_PACKET);
switch (discover_version(&reader)) {
case protocol_v2: