From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2011 05:11:46 +0000 (-0700)
Subject: Merge branch 'sp/maint-fd-limit' into maint
X-Git-Tag: v1.7.4.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0bd20f10ea1884c1118efc19ee6325ad6cce9105?ds=inline;hp=-c

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
---

0bd20f10ea1884c1118efc19ee6325ad6cce9105
diff --combined cache.h
index c782495a8f,663ab5804b..f2dabefd9d
--- a/cache.h
+++ b/cache.h
@@@ -545,6 -545,7 +545,6 @@@ extern int assume_unchanged
  extern int prefer_symlink_refs;
  extern int log_all_ref_updates;
  extern int warn_ambiguous_refs;
 -extern int unique_abbrev_extra_length;
  extern int shared_repository;
  extern const char *apply_default_whitespace;
  extern const char *apply_default_ignorewhitespace;
@@@ -570,7 -571,7 +570,7 @@@ extern enum safe_crlf safe_crlf
  enum auto_crlf {
  	AUTO_CRLF_FALSE = 0,
  	AUTO_CRLF_TRUE = 1,
 -	AUTO_CRLF_INPUT = -1,
 +	AUTO_CRLF_INPUT = -1
  };
  
  extern enum auto_crlf auto_crlf;
@@@ -607,7 -608,7 +607,7 @@@ enum rebase_setup_type 
  enum push_default_type {
  	PUSH_DEFAULT_NOTHING = 0,
  	PUSH_DEFAULT_MATCHING,
 -	PUSH_DEFAULT_TRACKING,
 +	PUSH_DEFAULT_UPSTREAM,
  	PUSH_DEFAULT_CURRENT
  };
  
@@@ -898,7 -899,8 +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 */
diff --combined fast-import.c
index 87f36b36c3,2369a7b30a..b3ba778924
--- a/fast-import.c
+++ b/fast-import.c
@@@ -166,7 -166,8 +166,7 @@@ Format of STDIN stream
  #define DEPTH_BITS 13
  #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
  
 -struct object_entry
 -{
 +struct object_entry {
  	struct pack_idx_entry idx;
  	struct object_entry *next;
  	uint32_t type : TYPE_BITS,
@@@ -174,14 -175,16 +174,14 @@@
  		depth : DEPTH_BITS;
  };
  
 -struct object_entry_pool
 -{
 +struct object_entry_pool {
  	struct object_entry_pool *next_pool;
  	struct object_entry *next_free;
  	struct object_entry *end;
  	struct object_entry entries[FLEX_ARRAY]; /* more */
  };
  
 -struct mark_set
 -{
 +struct mark_set {
  	union {
  		struct object_entry *marked[1024];
  		struct mark_set *sets[1024];
@@@ -189,49 -192,57 +189,49 @@@
  	unsigned int shift;
  };
  
 -struct last_object
 -{
 +struct last_object {
  	struct strbuf data;
  	off_t offset;
  	unsigned int depth;
  	unsigned no_swap : 1;
  };
  
 -struct mem_pool
 -{
 +struct mem_pool {
  	struct mem_pool *next_pool;
  	char *next_free;
  	char *end;
  	uintmax_t space[FLEX_ARRAY]; /* more */
  };
  
 -struct atom_str
 -{
 +struct atom_str {
  	struct atom_str *next_atom;
  	unsigned short str_len;
  	char str_dat[FLEX_ARRAY]; /* more */
  };
  
  struct tree_content;
 -struct tree_entry
 -{
 +struct tree_entry {
  	struct tree_content *tree;
  	struct atom_str *name;
 -	struct tree_entry_ms
 -	{
 +	struct tree_entry_ms {
  		uint16_t mode;
  		unsigned char sha1[20];
  	} versions[2];
  };
  
 -struct tree_content
 -{
 +struct tree_content {
  	unsigned int entry_capacity; /* must match avail_tree_content */
  	unsigned int entry_count;
  	unsigned int delta_depth;
  	struct tree_entry *entries[FLEX_ARRAY]; /* more */
  };
  
 -struct avail_tree_content
 -{
 +struct avail_tree_content {
  	unsigned int entry_capacity; /* must match tree_content */
  	struct avail_tree_content *next_avail;
  };
  
 -struct branch
 -{
 +struct branch {
  	struct branch *table_next_branch;
  	struct branch *active_next_branch;
  	const char *name;
@@@ -243,14 -254,16 +243,14 @@@
  	unsigned char sha1[20];
  };
  
 -struct tag
 -{
 +struct tag {
  	struct tag *next_tag;
  	const char *name;
  	unsigned int pack_id;
  	unsigned char sha1[20];
  };
  
 -struct hash_list
 -{
 +struct hash_list {
  	struct hash_list *next;
  	unsigned char sha1[20];
  };
@@@ -261,7 -274,8 +261,7 @@@ typedef enum 
  	WHENSPEC_NOW
  } whenspec_type;
  
 -struct recent_command
 -{
 +struct recent_command {
  	struct recent_command *prev;
  	struct recent_command *next;
  	char *buf;
@@@ -857,6 -871,7 +857,7 @@@ static void start_packfile(void
  	p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
  	strcpy(p->pack_name, tmpfile);
  	p->pack_fd = pack_fd;
+ 	p->do_not_close = 1;
  	pack_file = sha1fd(pack_fd, p->pack_name);
  
  	hdr.hdr_signature = htonl(PACK_SIGNATURE);