From 996277c520641d650dc15ad751cc4ad33318e298 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Tue, 6 Dec 2011 18:43:37 +0100 Subject: Refactor cache_tree_update idiom from commit We'll need to safely create or update the cache-tree data of the_index from other places. While at it, give it an argument that lets us silence the messages produced by unmerged entries (which prevent it from working). Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- builtin/commit.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'builtin/commit.c') diff --git a/builtin/commit.c b/builtin/commit.c index 8f2bebecf3..4f782a33f1 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -862,10 +862,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, */ 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; } -- cgit v1.2.3