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

* il/archive-err-signal: Support ERR in remote archive like in fetch/push
git-mirror · Oct 21, 2011 · 689b047 · 689b047
2 parents c510259 + 908aace
commit 689b047
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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"));
 	}