projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
read-tree -u one-way merge fix to check out locally modified paths.
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
11157f4
..
59b6a6b
100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-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);