From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 May 2006 17:51:19 GMT
Subject: Re: Allow one-way tree merge to remove old files
Message-ID: <7vy7x41omg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0605141040210.3866@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

> 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.

Good catch.  I think it is a leftover from the days we did not
have -u there; returning 0 was a way to say "there is no cache
entry resulting from this round of path-merge".