Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 07:20:31 +0000 (23:20 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 07:20:31 +0000 (23:20 -0800)
* maint:
  read-tree --aggressive: remove deleted entry from the working tree.

read-tree.c

index f39fe5c..c56b572 100644 (file)
@@ -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.
                 */