From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Mar 2009 06:02:47 +0000 (-0700)
Subject: Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint
X-Git-Tag: v1.6.2.2~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0e1aa2f7af6cc11c56a780764ef0ca94c19f0724?ds=inline;hp=-c

Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint

* jc/maint-1.6.0-read-tree-overlay:
read-tree A B C: do not create a bogus index and do not segfault
---

0e1aa2f7af6cc11c56a780764ef0ca94c19f0724
diff --combined unpack-trees.c
index e547282ed5,5b0a8c1728..5820ce48f3
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -49,7 -49,7 +49,7 @@@ static void add_entry(struct unpack_tre
  	memcpy(new, ce, size);
  	new->next = NULL;
  	new->ce_flags = (new->ce_flags & ~clear) | set;
- 	add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|ADD_CACHE_SKIP_DFCHECK);
+ 	add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
  }
  
  /* Unlink the last component and attempt to remove leading
@@@ -61,7 -61,7 +61,7 @@@ static void unlink_entry(struct cache_e
  	char *cp, *prev;
  	char *name = ce->name;
  
 -	if (has_symlink_leading_path(ce_namelen(ce), ce->name))
 +	if (has_symlink_or_noent_leading_path(ce_namelen(ce), ce->name))
  		return;
  	if (unlink(name))
  		return;
@@@ -240,11 -240,8 +240,11 @@@ static struct cache_entry *create_ce_en
  	return ce;
  }
  
 -static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmask, struct cache_entry *src[5],
 -	const struct name_entry *names, const struct traverse_info *info)
 +static int unpack_nondirectories(int n, unsigned long mask,
 +				 unsigned long dirmask,
 +				 struct cache_entry **src,
 +				 const struct name_entry *names,
 +				 const struct traverse_info *info)
  {
  	int i;
  	struct unpack_trees_options *o = info->data;
@@@ -286,15 -283,15 +286,15 @@@
  	if (o->merge)
  		return call_unpack_fn(src, o);
  
- 	n += o->merge;
  	for (i = 0; i < n; i++)
- 		add_entry(o, src[i], 0, 0);
+ 		if (src[i] && src[i] != o->df_conflict_entry)
+ 			add_entry(o, src[i], 0, 0);
  	return 0;
  }
  
  static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
  {
 -	struct cache_entry *src[5] = { NULL, };
 +	struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
  	struct unpack_trees_options *o = info->data;
  	const struct name_entry *p = names;
  
@@@ -355,7 -352,7 +355,7 @@@ static int unpack_failed(struct unpack_
  	discard_index(&o->result);
  	if (!o->gently) {
  		if (message)
 -			return error(message);
 +			return error("%s", message);
  		return -1;
  	}
  	return -1;
@@@ -379,13 -376,12 +379,13 @@@ int unpack_trees(unsigned len, struct t
  	state.refresh_cache = 1;
  
  	memset(&o->result, 0, sizeof(o->result));
 +	o->result.initialized = 1;
  	if (o->src_index)
  		o->result.timestamp = o->src_index->timestamp;
  	o->merge_size = len;
  
  	if (!dfc)
 -		dfc = xcalloc(1, sizeof(struct cache_entry) + 1);
 +		dfc = xcalloc(1, cache_entry_size(0));
  	o->df_conflict_entry = dfc;
  
  	if (len) {
@@@ -497,7 -493,7 +497,7 @@@ static int verify_clean_subdirectory(st
  	 * anything in the existing directory there.
  	 */
  	int namelen;
 -	int pos, i;
 +	int i;
  	struct dir_struct d;
  	char *pathbuf;
  	int cnt = 0;
@@@ -518,20 -514,24 +518,20 @@@
  	 * in that directory.
  	 */
  	namelen = strlen(ce->name);
 -	pos = index_name_pos(o->src_index, ce->name, namelen);
 -	if (0 <= pos)
 -		return cnt; /* we have it as nondirectory */
 -	pos = -pos - 1;
 -	for (i = pos; i < o->src_index->cache_nr; i++) {
 -		struct cache_entry *ce = o->src_index->cache[i];
 -		int len = ce_namelen(ce);
 +	for (i = o->pos; i < o->src_index->cache_nr; i++) {
 +		struct cache_entry *ce2 = o->src_index->cache[i];
 +		int len = ce_namelen(ce2);
  		if (len < namelen ||
 -		    strncmp(ce->name, ce->name, namelen) ||
 -		    ce->name[namelen] != '/')
 +		    strncmp(ce->name, ce2->name, namelen) ||
 +		    ce2->name[namelen] != '/')
  			break;
  		/*
 -		 * ce->name is an entry in the subdirectory.
 +		 * ce2->name is an entry in the subdirectory.
  		 */
 -		if (!ce_stage(ce)) {
 -			if (verify_uptodate(ce, o))
 +		if (!ce_stage(ce2)) {
 +			if (verify_uptodate(ce2, o))
  				return -1;
 -			add_entry(o, ce, CE_REMOVE, 0);
 +			add_entry(o, ce2, CE_REMOVE, 0);
  		}
  		cnt++;
  	}
@@@ -583,11 -583,11 +583,11 @@@ static int verify_absent(struct cache_e
  	if (o->index_only || o->reset || !o->update)
  		return 0;
  
 -	if (has_symlink_leading_path(ce_namelen(ce), ce->name))
 +	if (has_symlink_or_noent_leading_path(ce_namelen(ce), ce->name))
  		return 0;
  
  	if (!lstat(ce->name, &st)) {
 -		int cnt;
 +		int ret;
  		int dtype = ce_to_dtype(ce);
  		struct cache_entry *result;
  
@@@ -615,15 -615,13 +615,15 @@@
  			 * files that are in "foo/" we would lose
  			 * it.
  			 */
 -			cnt = verify_clean_subdirectory(ce, action, o);
 +			ret = verify_clean_subdirectory(ce, action, o);
 +			if (ret < 0)
 +				return ret;
  
  			/*
  			 * If this removed entries from the index,
  			 * what that means is:
  			 *
 -			 * (1) the caller unpack_trees_rec() saw path/foo
 +			 * (1) the caller unpack_callback() saw path/foo
  			 * in the index, and it has not removed it because
  			 * it thinks it is handling 'path' as blob with
  			 * D/F conflict;
@@@ -636,7 -634,7 +636,7 @@@
  			 * We need to increment it by the number of
  			 * deleted entries here.
  			 */
 -			o->pos += cnt;
 +			o->pos += ret;
  			return 0;
  		}
  
@@@ -942,17 -940,8 +942,17 @@@ int twoway_merge(struct cache_entry **s
  			return -1;
  		}
  	}
 -	else if (newtree)
 +	else if (newtree) {
 +		if (oldtree && !o->initial_checkout) {
 +			/*
 +			 * deletion of the path was staged;
 +			 */
 +			if (same(oldtree, newtree))
 +				return 1;
 +			return reject_merge(oldtree, o);
 +		}
  		return merged_entry(newtree, current, o);
 +	}
  	return deleted_entry(oldtree, current, o);
  }