From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 17:49:25 +0000 (-0700)
Subject: Merge branch 'il/archive-err-signal' into maint
X-Git-Tag: v1.7.7.1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/689b047072030db30d101d43dbef6afd3b703c09?hp=c510259c02b46d5edb84568ee9eb0967b25bb75b

Merge branch 'il/archive-err-signal' into maint

* il/archive-err-signal:
Support ERR in remote archive like in fetch/push
---

diff --git a/builtin/archive.c b/builtin/archive.c
index 883c0092ad..931956def9 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -61,6 +61,8 @@ static int run_remote_archiver(int argc, const char **argv,
 	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"));
 	}