Merge branch 'maint'

* maint: read-tree --aggressive: remove deleted entry from the working tree.
19 years ago · 2486927d2e
1 changed files with 4 additions and 2 deletions
--- a/read-tree.c
+++ b/read-tree.c
@ -560,9 +560,11 @@ static int threeway_merge(struct cache_entry **stages)
				@@ -560,9 +560,11 @@ static int threeway_merge(struct cache_entry **stages)
 		 */
 		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.
 		 */