summaryrefslogtreecommitdiff
path: root/zlib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-28 14:48:40 -0700
committerJunio C Hamano <gitster@pobox.com>2011-12-01 11:46:09 -0800
commit568508e76570e9ea36aad6446959424cebcf0535 (patch)
tree9b71da7197e9a084c3406d6020672dd11ac26b24 /zlib.c
parent6c526148644475acbc047faaeb57d42fde1f667d (diff)
downloadgit-568508e76570e9ea36aad6446959424cebcf0535.tar.gz
bulk-checkin: replace fast-import based implementationjc/stream-to-pack
This extends the earlier approach to stream a large file directly from the filesystem to its own packfile, and allows "git add" to send large files directly into a single pack. Older code used to spawn fast-import, but the new bulk-checkin API replaces it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'zlib.c')
-rw-r--r--zlib.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/zlib.c b/zlib.c
index 3c63d480c7..2b2c0c780e 100644
--- a/zlib.c
+++ b/zlib.c
@@ -188,13 +188,20 @@ void git_deflate_init_gzip(git_zstream *strm, int level)
strm->z.msg ? strm->z.msg : "no message");
}
-void git_deflate_end(git_zstream *strm)
+int git_deflate_abort(git_zstream *strm)
{
int status;
zlib_pre_call(strm);
status = deflateEnd(&strm->z);
zlib_post_call(strm);
+ return status;
+}
+
+void git_deflate_end(git_zstream *strm)
+{
+ int status = git_deflate_abort(strm);
+
if (status == Z_OK)
return;
error("deflateEnd: %s (%s)", zerr_to_string(status),