diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/archive.c | 6 | ||||
| -rw-r--r-- | builtin/fetch-pack.c | 3 | ||||
| -rw-r--r-- | builtin/receive-pack.c | 4 | ||||
| -rw-r--r-- | builtin/send-pack.c | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/builtin/archive.c b/builtin/archive.c index 2fe1f05ca2..45d11669aa 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -53,15 +53,15 @@ static int run_remote_archiver(int argc, const char **argv, packet_write_fmt(fd[1], "argument %s\n", argv[i]); packet_flush(fd[1]); - packet_reader_init(&reader, fd[0], NULL, 0, PACKET_READ_CHOMP_NEWLINE); + packet_reader_init(&reader, fd[0], NULL, 0, + PACKET_READ_CHOMP_NEWLINE | + PACKET_READ_DIE_ON_ERR_PACKET); if (packet_reader_read(&reader) != PACKET_READ_NORMAL) die(_("git archive: expected ACK/NAK, got a flush packet")); if (strcmp(reader.line, "ACK")) { if (starts_with(reader.line, "NACK ")) die(_("git archive: NACK %s"), reader.line + 5); - if (starts_with(reader.line, "ERR ")) - die(_("remote error: %s"), reader.line + 4); die(_("git archive: protocol error")); } diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 63e69a5801..85dbc2af87 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: diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 81cc073700..d58b7750b6 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1986,7 +1986,9 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) if (advertise_refs) return 0; - packet_reader_init(&reader, 0, NULL, 0, PACKET_READ_CHOMP_NEWLINE); + packet_reader_init(&reader, 0, NULL, 0, + PACKET_READ_CHOMP_NEWLINE | + PACKET_READ_DIE_ON_ERR_PACKET); if ((commands = read_head_info(&reader, &shallow)) != NULL) { const char *unpack_status = NULL; diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 8e3c7490f7..098ebf22d0 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: |