Merge branch 'jk/ls-files-recurse-submodules-fix'

diff --git a/fetch-pack.c b/fetch-pack.c
index 42969353d675af777ea1e34e4740ad1842802f0f..c5e686706100fc5f6b3a3ede30b0c6ce6a8645d6 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -276,6 +276,8 @@ static enum ack_type get_ack(int fd, unsigned char *result_sha1)
                        return ACK;
                }
        }
+       if (skip_prefix(line, "ERR ", &arg))
+               die(_("remote error: %s"), arg);
        die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line);
 }