read-cache: be strict about "changed" in remove_marked_cache_entries()

diff --git a/cache-tree.c b/cache-tree.c
index 7fa524a11323621d24c352b0a1108ae953a60cf5..52f8692efa2367c369d48ae1b61516be26981813 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -595,8 +595,7 @@ int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
                                      active_nr, flags) < 0)
                        return WRITE_TREE_UNMERGED_INDEX;
                if (0 <= newfd) {
-                       if (!write_cache(newfd, active_cache, active_nr) &&
-                           !commit_lock_file(lock_file))
+                       if (!write_locked_index(&the_index, lock_file, COMMIT_LOCK))
                                newfd = -1;
                }
                /* Not being able to write is fine -- we are only interested