Merge branch 'sp/maint-pack-memuse'
commit948e7471e03340307e802e919303256f80273d21
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2008 21:46:46 +0000 (9 14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2008 21:46:46 +0000 (9 14:46 -0700)
tree757bb73d94ba18ac6e0736605e8fff35943264a9
parentbb293b831b9d0aade79c0acf5bf6091106e7d19b
parenteac12e2d4d7fb9b388bdc88bf15cd86cbde91dfd
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
sha1_file.c