Merge branch 'db/cover-letter'

[git.git] / builtin-read-tree.c

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 726fb0b588dcb550b5554b111a416c7ac3b25521..7bdc312e3861103fa83b20b939962a8bc8e6cc0a 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -41,6 +41,7 @@ static int read_cache_unmerged(void)
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];
                if (ce_stage(ce)) {
+                       remove_index_entry(ce);
                        if (last && !strcmp(ce->name, last->name))
                                continue;
                        cache_tree_invalidate_path(active_cache_tree, ce->name);