mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lt/oneway' into next

Browse Source 
* lt/oneway:
  read-tree -u one-way merge fix to check out locally modified paths.
This commit is contained in:
Junio C Hamano
2006-05-15 00:48:00 -07:00
parent 5fd51c77fa 613f02739a
commit e8efc9036f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
read-tree.c
View File

@ -723,6 +723,9 @@ static int oneway_merge(struct cache_entry **src)
return deleted_entry(old, NULL); return deleted_entry(old, NULL);
} }
if (old && same(old, a)) { 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 keep_entry(old);
} }
return merged_entry(a, NULL); return merged_entry(a, NULL);