mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-05 16:11:20 +02:00
Code

Allow one-way tree merge to remove old files

Browse Source 
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>
This commit is contained in:
Linus Torvalds 2006-05-14 10:43:50 -07:00 committed by Junio C Hamano
parent 975bf9cf5a
commit 76b99b8161
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
read-tree.c
View File

@ -684,7 +684,7 @@ static int oneway_merge(struct cache_entry **src)
merge_size);
if (!a)
return 0;
return deleted_entry(old, NULL);
if (old && same(old, a)) {
return keep_entry(old);
}