Re: [PATCH] unpack-trees: don't update files flagged for deletion

2015-07-17 Thread Junio C Hamano
David Turner writes: > Don't update files in the worktree from cache entries which are > flagged with CE_WT_REMOVE. This is fixes merges in sparse > checkouts. s/This is/This/; But more importantly, what is missing is "why" it is a good fix. i.e. things like: - why is it wrong to update what

[PATCH] unpack-trees: don't update files flagged for deletion

2015-07-17 Thread David Turner
Don't update files in the worktree from cache entries which are flagged with CE_WT_REMOVE. This is fixes merges in sparse checkouts. Signed-off-by: Anatole Shaw Signed-off-by: David Turner --- This patch was written by my colleague Anatole Shaw for Twitter's git; I just rebased it on mainstrea