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
17 years ago · 948e7471e0
1 changed files with 1 additions and 0 deletions
--- a/sha1_file.c
+++ b/sha1_file.c
@ -1630,6 +1630,7 @@ static void *unpack_delta_entry(struct packed_git *p,
				@@ -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) {
 		/*