Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'il/archive-err-signal'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 14 Oct 2011 02:03:23 +0000
(19:03 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 14 Oct 2011 02:03:23 +0000
(19:03 -0700)
* il/archive-err-signal:
Support ERR in remote archive like in fetch/push
builtin/archive.c
patch
|
blob
|
history
raw
(from parent 1:
ab1e76b
)
diff --git
a/builtin/archive.c
b/builtin/archive.c
index 883c0092ad43d602136e68d2afde8e319a904676..931956def986bbdf5b77e163f1b18c961e7be09c 100644
(file)
--- 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"));
}