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

* il/archive-err-signal:
  Support ERR in remote archive like in fetch/push
This commit is contained in:
Junio C Hamano 2011-10-06 15:42:00 -07:00
commit 7e3083f3fe

View file

@ -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"));
}