summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-09 14:46:46 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-09 14:46:46 -0700
commit948e7471e03340307e802e919303256f80273d21 (patch)
tree757bb73d94ba18ac6e0736605e8fff35943264a9 /sha1_file.c
parentbb293b831b9d0aade79c0acf5bf6091106e7d19b (diff)
parenteac12e2d4d7fb9b388bdc88bf15cd86cbde91dfd (diff)
downloadgit-948e7471e03340307e802e919303256f80273d21.tar.gz
Merge branch 'sp/maint-pack-memuse'
* sp/maint-pack-memuse: Correct pack memory leak causing git gc to try to exceed ulimit Conflicts: sha1_file.c
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 1670e913af..2df78b5afd 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1630,6 +1630,7 @@ static void *unpack_delta_entry(struct packed_git *p,
(uintmax_t)curpos, p->pack_name);
return NULL;
}
+ unuse_pack(w_curs);
base = cache_or_unpack_entry(p, base_offset, &base_size, type, 0);
if (!base) {
/*