mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
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:
commit
948e7471e0
|
@ -1630,6 +1630,7 @@ static void *unpack_delta_entry(struct packed_git *p,
|
||||||
(uintmax_t)curpos, p->pack_name);
|
(uintmax_t)curpos, p->pack_name);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
unuse_pack(w_curs);
|
||||||
base = cache_or_unpack_entry(p, base_offset, &base_size, type, 0);
|
base = cache_or_unpack_entry(p, base_offset, &base_size, type, 0);
|
||||||
if (!base) {
|
if (!base) {
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue