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

* il/archive-err-signal: Support ERR in remote archive like in fetch/push
13 years ago · 689b047072
1 changed files with 2 additions and 0 deletions
--- a/builtin/archive.c
+++ b/builtin/archive.c
@ -61,6 +61,8 @@ static int run_remote_archiver(int argc, const char **argv,
				@@ -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"));
 	}