diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:25 -0700 |
| commit | 689b047072030db30d101d43dbef6afd3b703c09 (patch) | |
| tree | 82deb0182c3a35f35bca7c6680ad21aaccca556e /builtin | |
| parent | Merge branch 'js/maint-merge-one-file-osx-expr' into maint (diff) | |
| parent | Support ERR in remote archive like in fetch/push (diff) | |
| download | tgif-689b047072030db30d101d43dbef6afd3b703c09.tar.xz | |
Merge branch 'il/archive-err-signal' into maint
* il/archive-err-signal:
Support ERR in remote archive like in fetch/push
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/archive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/archive.c b/builtin/archive.c index 883c0092ad..931956def9 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")); } |