diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 22:16:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 22:16:04 +0300 |
| commit | 17069c7fae20f5e3082ee639066a37de5af6030e (patch) | |
| tree | 52b612da693386eae08a4d87540c15744d468b13 /transport.c | |
| parent | ecbdaf0899161c067986e9d9d564586d4b045d62 (diff) | |
| parent | 2d103c31c2cfcf03ff1408d639043469b0c93f70 (diff) | |
Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband
* ms/packet-err-check:
pack-protocol.txt: accept error packets in any context
Use packet_reader instead of packet_read_line
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 99678153c1..e078812897 100644 --- a/transport.c +++ b/transport.c @@ -273,7 +273,8 @@ static struct ref *handshake(struct transport *transport, int for_push, packet_reader_init(&reader, data->fd[0], NULL, 0, PACKET_READ_CHOMP_NEWLINE | - PACKET_READ_GENTLE_ON_EOF); + PACKET_READ_GENTLE_ON_EOF | + PACKET_READ_DIE_ON_ERR_PACKET); data->version = discover_version(&reader); switch (data->version) { |