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 /merge.c | |
| parent | Merge branch 'da/darwin' (diff) | |
| parent | Don't close pack fd when free'ing pack windows (diff) | |
| download | tgif-04fbba0119a1e5aeece9a6c4ee70dad8fbd07b0f.tar.xz | |
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 'merge.c')
0 files changed, 0 insertions, 0 deletions