Merge branch 'bp/refresh-cache-ent-rehash-fix'

diff --git a/fetch-pack.c b/fetch-pack.c
index 8253d746e0c40492e05360fe6f27bfa85bb39fbc..d97461296d5692521cd038f9ffa0b5f5c3c3f3dd 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -261,8 +261,8 @@ static enum ack_type get_ack(int fd, struct object_id *result_oid)
        char *line = packet_read_line(fd, &len);
        const char *arg;
 
-       if (!len)
-               die(_("git fetch-pack: expected ACK/NAK, got EOF"));
+       if (!line)
+               die(_("git fetch-pack: expected ACK/NAK, got a flush packet"));
        if (!strcmp(line, "NAK"))
                return NAK;
        if (skip_prefix(line, "ACK ", &arg)) {