From: Junio C Hamano <junkio@cox.net>
Date: Thu, 2 Mar 2006 07:20:31 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.3.0-rc1~96
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2486927d2ec9cc05ed7589540d103382d3751c10?hp=-c

Merge branch 'maint'

* maint:
read-tree --aggressive: remove deleted entry from the working tree.
---

2486927d2ec9cc05ed7589540d103382d3751c10
diff --combined read-tree.c
index f39fe5ca65,da0fcf035e..c56b572d05
--- a/read-tree.c
+++ b/read-tree.c
@@@ -404,7 -404,7 +404,7 @@@ static void verify_uptodate(struct cach
  		return;
  
  	if (!lstat(ce->name, &st)) {
 -		unsigned changed = ce_match_stat(ce, &st);
 +		unsigned changed = ce_match_stat(ce, &st, 1);
  		if (!changed)
  			return;
  		errno = 0;
@@@ -560,9 -560,11 +560,11 @@@ static int threeway_merge(struct cache_
  		 */
  		if ((head_deleted && remote_deleted) ||
  		    (head_deleted && remote && remote_match) ||
- 		    (remote_deleted && head && head_match))
+ 		    (remote_deleted && head && head_match)) {
+ 			if (index)
+ 				return deleted_entry(index, index);
  			return 0;
- 
+ 		}
  		/*
  		 * Added in both, identically.
  		 */