Merge branch 'ra/rev-parse-exclude-glob'

diff --git a/sha1-file.c b/sha1-file.c
index dd0b6aa873a95433906b52abf605a43acc924d4a..2daf7d9935d4aea4db13067f1134bc851c8ab166 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -2199,7 +2199,8 @@ static int check_stream_sha1(git_zstream *stream,
         * see the comment in unpack_sha1_rest for details.
         */
        while (total_read <= size &&
-              (status == Z_OK || status == Z_BUF_ERROR)) {
+              (status == Z_OK ||
+               (status == Z_BUF_ERROR && !stream->avail_out))) {
                stream->next_out = buf;
                stream->avail_out = sizeof(buf);
                if (size - total_read < stream->avail_out)