Merge branch 'se/tag' into next

[git.git] / read-tree.c

diff --git a/read-tree.c b/read-tree.c
index c25385d79f605c74ae9e9cde06225f0a4c834f00..3f0233954725397c8783f544f2f8d27125b82a13 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -720,9 +720,12 @@ static int oneway_merge(struct cache_entry **src)
 
        if (!a) {
                invalidate_ce_path(old);
-               return 0;
+               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);