aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-16 15:24:07 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-16 15:24:07 -0700
commitbbe99ea8f6b321d0953118fb19278b7621fe8026 (patch)
treed6a1609182d7b276d45eb117bc6f5611d5b1d6d5
parent614de95c760480fd0d91c5afecd0e3b71d4230d0 (diff)
parenteac12e2d4d7fb9b388bdc88bf15cd86cbde91dfd (diff)
downloadgit-bbe99ea8f6b321d0953118fb19278b7621fe8026.tar.gz
git-bbe99ea8f6b321d0953118fb19278b7621fe8026.tar.xz
Merge branch 'sp/maint-pack-memuse' into maint
* sp/maint-pack-memuse: Correct pack memory leak causing git gc to try to exceed ulimit
-rw-r--r--sha1_file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c
index d1c406081..10346b681 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"