read-tree --aggressive: remove deleted entry from the working tree.
When both heads deleted, or our side deleted while the other side did not touch, we did not have to update the working tree. However, we forgot to remove existing working tree file when we did not touch and the other side did. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 1, 2006 at 23:10 UTC
1142038098810a69e57d88554559e4e6116df177
1 file changed
+4
-2
read-tree.c
+4
-2
@@ -560,9 +560,11 @@ static int threeway_merge(struct cache_entry **stages)
560
*/
561
if ((head_deleted && remote_deleted) ||
562
(head_deleted && remote && remote_match) ||
563
- (remote_deleted && head && head_match))
563
+ (remote_deleted && head && head_match)) {
564
+ if (index)
565
+ return deleted_entry(index, index);
566
return 0;
565
-
567
+ }
568
/*
569
* Added in both, identically.
570
*/