Skip to content

Commit

Permalink
read-tree --aggressive: remove deleted entry from the working tree.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Mar 2, 2006
1 parent e1a0c8b commit 1142038
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions read-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit 1142038

Please sign in to comment.