From: Junio C Hamano Date: Thu, 2 Mar 2006 07:10:00 +0000 (-0800) Subject: read-tree --aggressive: remove deleted entry from the working tree. X-Git-Tag: v1.3.0-rc1~64^2~1 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1142038098810a69e57d88554559e4e6116df177;p=git.git 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 --- diff --git a/read-tree.c b/read-tree.c index bb50a800..da0fcf03 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. */