Allow one-way tree merge to remove old files

[git.git] / read-tree.c

diff --git a/read-tree.c b/read-tree.c
index e926e4c..11157f4 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -684,7 +684,7 @@ static int oneway_merge(struct cache_entry **src)
                             merge_size);
 
        if (!a)
-               return 0;
+               return deleted_entry(old, NULL);
        if (old && same(old, a)) {
                return keep_entry(old);
        }