diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:11 (GMT) |
| commit | 5f8b86db94e789bc07258f98cc5ba25d18273d83 (patch) | |
| tree | e4f8a21992261176c7ac61a90ac437bd7e4035af /builtin/fetch-pack.c | |
| parent | 33bea7358f68d165d65357c04b465209b56dc8f0 (diff) | |
| parent | 07c3c2aa16370fd97551b7d1aa6af3d051e7cf8f (diff) | |
| download | git-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/fetch-pack.c')
| -rw-r--r-- | builtin/fetch-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index f6a5134..153a2bd 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -218,7 +218,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); version = discover_version(&reader); switch (version) { |