From 1142038098810a69e57d88554559e4e6116df177 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 1 Mar 2006 23:10:00 -0800 Subject: 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 --- read-tree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/read-tree.c b/read-tree.c index bb50a800d7..da0fcf035e 100644 --- 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. */ -- cgit v1.2.3