diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:53 -0700 |
| commit | d2617eb98440a43072c49e416e0986ef3231faa4 (patch) | |
| tree | c2159b91bf34ad5ec9b3d1d7c58bdf3e06fa104b /fetch-pack.c | |
| parent | b30cf6761a08ff10fe3f8295796399d8630fadb0 (diff) | |
| parent | 8e2c7bef034f0712c6db776974ee4b40f1150a56 (diff) | |
| download | git-d2617eb98440a43072c49e416e0986ef3231faa4.tar.gz git-d2617eb98440a43072c49e416e0986ef3231faa4.tar.xz | |
Merge branch 'jt/fetch-pack-error-reporting'
"git fetch-pack" was not prepared to accept ERR packet that the
upload-pack can send with a human-readable error message. It
showed the packet contents with ERR prefix, so there was no data
loss, but it was redundant to say "ERR" in an error message.
* jt/fetch-pack-error-reporting:
fetch-pack: show clearer error message upon ERR
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 42969353d..c5e686706 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -276,6 +276,8 @@ static enum ack_type get_ack(int fd, unsigned char *result_sha1) return ACK; } } + if (skip_prefix(line, "ERR ", &arg)) + die(_("remote error: %s"), arg); die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line); } |