diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:30:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:30:21 -0700 |
| commit | 04fbba0119a1e5aeece9a6c4ee70dad8fbd07b0f (patch) | |
| tree | 01b503fb6517938537cc485b5a8fac11a11f0faa /builtin/pack-objects.c | |
| parent | Merge branch 'da/darwin' (diff) | |
| parent | Don't close pack fd when free'ing pack windows (diff) | |
| download | git-04fbba0119a1e5aeece9a6c4ee70dad8fbd07b0f.tar.gz git-04fbba0119a1e5aeece9a6c4ee70dad8fbd07b0f.zip | |
Merge branch 'bc/unuse-packfile'
Handle memory pressure and file descriptor pressure separately when
deciding to release pack windows to honor resource limits.
* bc/unuse-packfile:
Don't close pack fd when free'ing pack windows
sha1_file: introduce close_one_pack() to close packs on fd pressure
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f069462cb0..4eb0521c81 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1809,7 +1809,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size, static void try_to_free_from_threads(size_t size) { read_lock(); - release_pack_memory(size, -1); + release_pack_memory(size); read_unlock(); } |