summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec014ea)
raw | patch | inline | side by side (parent: ec014ea)
author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
Mon, 3 Oct 2011 11:01:59 +0000 (14:01 +0300) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Oct 2011 16:27:29 +0000 (09:27 -0700) |
Make ERR as first packet of remote snapshot reply work like it does in
fetch/push. Lets servers decline remote snapshot with message the same
way as declining fetch/push with a message.
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fetch/push. Lets servers decline remote snapshot with message the same
way as declining fetch/push with a message.
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/archive.c | patch | blob | history |
diff --git a/builtin/archive.c b/builtin/archive.c
index b14eaba1594bad060e0c881326368b9b2be3b158..6ec06d3e27b0069f6022c3d20576a3e25b7c8ff0 100644 (file)
--- a/builtin/archive.c
+++ b/builtin/archive.c
if (strcmp(buf, "ACK")) {
if (len > 5 && !prefixcmp(buf, "NACK "))
die(_("git archive: NACK %s"), buf + 5);
+ if (len > 4 && !prefixcmp(buf, "ERR "))
+ die(_("remote error: %s"), buf + 4);
die(_("git archive: protocol error"));
}