summaryrefslogtreecommitdiff
path: root/builtin/archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-14 02:03:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-14 02:03:23 (GMT)
commit1810abb994b4dd6b7f53dfe0a84b7e24cd43f78b (patch)
tree0edb7c66e3334cc0f957990f5dd34465ff385999 /builtin/archive.c
parentab1e76b88c836b16f37083910a4b1844fb4ddaca (diff)
parent908aaceb92c4fcc983c395350d4a188778ae500d (diff)
downloadgit-1810abb994b4dd6b7f53dfe0a84b7e24cd43f78b.zip
git-1810abb994b4dd6b7f53dfe0a84b7e24cd43f78b.tar.gz
git-1810abb994b4dd6b7f53dfe0a84b7e24cd43f78b.tar.bz2
Merge branch 'il/archive-err-signal'
* il/archive-err-signal: Support ERR in remote archive like in fetch/push
Diffstat (limited to 'builtin/archive.c')
-rw-r--r--builtin/archive.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/archive.c b/builtin/archive.c
index 883c009..931956d 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"));
}