]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/unuse-packfile'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:30:21 +0000 (12:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:30:21 +0000 (12:30 -0700)
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

1  2 
git-compat-util.h
sha1_file.c

Simple merge
diff --cc sha1_file.c
Simple merge