Merge branch 'maint'

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

diff --git a/read-tree.c b/read-tree.c
index f39fe5ca653db7a4972cf99e790991c3d88495d0..c56b572d05266bb6eeae394184708d2075945d18 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -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.
                 */