summaryrefslogtreecommitdiff
path: root/builtin/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:11 (GMT)
commit5f8b86db94e789bc07258f98cc5ba25d18273d83 (patch)
treee4f8a21992261176c7ac61a90ac437bd7e4035af /builtin/send-pack.c
parent33bea7358f68d165d65357c04b465209b56dc8f0 (diff)
parent07c3c2aa16370fd97551b7d1aa6af3d051e7cf8f (diff)
downloadgit-5f8b86db94e789bc07258f98cc5ba25d18273d83.zip
git-5f8b86db94e789bc07258f98cc5ba25d18273d83.tar.gz
git-5f8b86db94e789bc07258f98cc5ba25d18273d83.tar.bz2
Merge branch 'jt/fetch-v2-sideband'
"git fetch" and "git upload-pack" learned to send all exchange over the sideband channel while talking the v2 protocol. * jt/fetch-v2-sideband: tests: define GIT_TEST_SIDEBAND_ALL {fetch,upload}-pack: sideband v2 fetch response sideband: reverse its dependency on pkt-line pkt-line: introduce struct packet_writer pack-protocol.txt: accept error packets in any context Use packet_reader instead of packet_read_line
Diffstat (limited to 'builtin/send-pack.c')
-rw-r--r--builtin/send-pack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 8e3c749..098ebf2 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -250,7 +250,8 @@ int cmd_send_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: