mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 12:21:46 +02:00
Code

read-tree -u one-way merge fix to check out locally modified paths.

Browse Source 
The "-u" flag means "update the working tree files", but to
other types of merges, it also implies "I want to keep my local
changes" -- because they prevent local changes from getting lost
by using verify_uptodate.  The one-way merge is different from
other merges in that its purpose is opposite of doing something
else while keeping unrelated local changes.  The point of
one-way merge is to nuke local changes.  So while it feels
somewhat wrong that this actively loses local changes, it is the
right thing to do.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-05-15 00:46:05 -07:00
parent c68998f5b5
commit 613f02739a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
read-tree.c
View File

@ -686,6 +686,9 @@ static int oneway_merge(struct cache_entry **src)
if (!a)
return deleted_entry(old, NULL);
if (old && same(old, a)) {
struct stat st;
if (lstat(old->name, &st) || ce_match_stat(old, &st, 1))
old->ce_flags |= htons(CE_UPDATE);
return keep_entry(old);
}
return merged_entry(a, NULL);