Merge branch 'sp/maint-fd-limit' into maint

* 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
2011-03-20 22:11:46 -07:00
parent dd7d0d0976 d131b7afea
commit 0bd20f10ea
4 changed files with 85 additions and 19 deletions
--- a/cache.h
+++ b/cache.h
@ -898,7 +898,8 @@ extern struct packed_git {
 	time_t mtime;
 	int pack_fd;
 	unsigned pack_local:1,
-		 pack_keep:1;
+		 pack_keep:1,
+		 do_not_close:1;
 	unsigned char sha1[20];
 	/* something like ".git/objects/pack/xxxxx.pack" */
 	char pack_name[FLEX_ARRAY]; /* more */