diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-15 00:48:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 00:48:00 -0700 |
| commit | e8efc9036fd7b793e84af4165fea715794924794 (patch) | |
| tree | 2a6caf86a8f5a8f17d251a555344bad5bfeb6bc5 /read-tree.c | |
| parent | Merge branch 'se/diff' into next (diff) | |
| parent | read-tree -u one-way merge fix to check out locally modified paths. (diff) | |
| download | tgif-e8efc9036fd7b793e84af4165fea715794924794.tar.xz | |
Merge branch 'lt/oneway' into next
* lt/oneway:
read-tree -u one-way merge fix to check out locally modified paths.
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/read-tree.c b/read-tree.c index 7c830312c4..3f02339547 100644 --- a/read-tree.c +++ b/read-tree.c @@ -723,6 +723,9 @@ static int oneway_merge(struct cache_entry **src) 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); |