Merge branch 'sp/maint-fd-limit'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:23 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:23 +0000 (14:22 -0700)
* sp/maint-fd-limit:
  sha1_file.c: Don't retain open fds on small packs
  mingw: add minimum getrlimit() compatibility stub
  Limit file descriptors used by packs

1  2 
cache.h
compat/mingw.h
fast-import.c
sha1_file.c

diff --cc cache.h
Simple merge
diff --cc compat/mingw.h
Simple merge
diff --cc fast-import.c
Simple merge
diff --cc sha1_file.c
Simple merge