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

gitster · gitster · commit 689b04707203 · 2011-10-21T10:49:25.000-07:00
* il/archive-err-signal:
  Support ERR in remote archive like in fetch/push
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"));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ static int run_remote_archiver(int argc, const char **argv,`
`61`	`61`	`if (strcmp(buf, "ACK")) {`
`62`	`62`	`if (len > 5 && !prefixcmp(buf, "NACK "))`
`63`	`63`	`die(_("git archive: NACK %s"), buf + 5);`
	`64`	`+ if (len > 4 && !prefixcmp(buf, "ERR "))`
	`65`	`+ die(_("remote error: %s"), buf + 4);`
`64`	`66`	`die(_("git archive: protocol error"));`
`65`	`67`	`}`
`66`	`68`