git-am: implement --reject option passed to git-apply

[git.git] / builtin-apply.c

diff --git a/builtin-apply.c b/builtin-apply.c
index 6d5a60214ca5de6cb4376a66503cb8149b7ef997..b415daf07edacacd8bda0527bb5ed229be91c861 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1258,8 +1258,9 @@ static char *inflate_it(const void *data, unsigned long size,
        stream.avail_in = size;
        stream.next_out = out = xmalloc(inflated_size);
        stream.avail_out = inflated_size;
-       inflateInit(&stream);
-       st = inflate(&stream, Z_FINISH);
+       git_inflate_init(&stream);
+       st = git_inflate(&stream, Z_FINISH);
+       git_inflate_end(&stream);
        if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
                free(out);
                return NULL;