diff --git a/builtin/commit.c b/builtin/commit.c
index c46f2d18e10bcb3b1b458d4ae94d2d3522305632..4f782a33f1dde5c82d7da5f1051083a743e00ddd 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
*/
discard_cache();
read_cache_from(index_file);
- if (!active_cache_tree)
- active_cache_tree = cache_tree();
- if (cache_tree_update(active_cache_tree,
- active_cache, active_nr, 0, 0) < 0) {
+ if (update_main_cache_tree(0)) {
error(_("Error building trees"));
return 0;
}
}
unlink(git_path("CHERRY_PICK_HEAD"));
+ unlink(git_path("REVERT_HEAD"));
unlink(git_path("MERGE_HEAD"));
unlink(git_path("MERGE_MSG"));
unlink(git_path("MERGE_MODE"));