From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jul 2008 22:24:07 +0000 (-0700)
Subject: Merge branch 'sp/maint-pack-memuse' into maint
X-Git-Tag: v1.5.6.4~10
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/bbe99ea8f6b321d0953118fb19278b7621fe8026?hp=614de95c760480fd0d91c5afecd0e3b71d4230d0

Merge branch 'sp/maint-pack-memuse' into maint

* sp/maint-pack-memuse:
Correct pack memory leak causing git gc to try to exceed ulimit
---

diff --git a/sha1_file.c b/sha1_file.c
index d1c406081e..10346b681e 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1609,6 +1609,7 @@ static void *unpack_delta_entry(struct packed_git *p,
 	off_t base_offset;
 
 	base_offset = get_delta_base(p, w_curs, &curpos, *type, obj_offset);
+	unuse_pack(w_curs);
 	base = cache_or_unpack_entry(p, base_offset, &base_size, type, 0);
 	if (!base)
 		die("failed to read delta base object"