Allow one-way tree merge to remove old files
authorLinus Torvalds <torvalds@osdl.org>
Sun, 14 May 2006 17:43:50 +0000 (10:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:48:23 +0000 (16:48 -0700)
commit76b99b81613abea4cc16e45e1b11dbbec82a4b4d
tree71e223857537c34fc72f8ddeb26470f0ae2640d3
parent975bf9cf5ad5d440f98f464ae8124609a4835ce1
Allow one-way tree merge to remove old files

For some random reason (probably just because nobody noticed), the one-way
merge strategy didn't mark deleted files as deleted, so if you used

git-read-tree -m -u <newtree>

it would update the files that got changed in the index, but it would not
delete the files that got deleted.

This should fix it, and I can't imagine that anybody depends on the old
strange "update only existing files" behaviour.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
read-tree.c