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
This commit is contained in:
Junio C Hamano 2008-07-09 14:46:46 -07:00
commit 948e7471e0

View File

@ -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) {
/*