From f5184380f08c814535e7bda374e403596eef90a3 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Thu, 4 Jan 2007 11:22:47 +0100 Subject: Speed-up recursive by flushing index only once for all entries The merge-recursive implementation in C inherited the invariant that the on-file index file is written out and later read back after any index operations and writing trees from the original Python implementation. But it was only because the original implementation worked at the scripting level. There is no need to write out the index file after handling every path. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano diff --git a/merge-recursive.c b/merge-recursive.c index 87a27e0..aab4c34 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -954,8 +954,6 @@ static int process_renames(struct path_list *a_renames, path_list_clear(&a_by_dst, 0); path_list_clear(&b_by_dst, 0); - if (cache_dirty) - flush_cache(); return clean_merge; } @@ -1083,9 +1081,6 @@ static int process_entry(const char *path, struct stage_data *entry, } else die("Fatal merge failure, shouldn't happen."); - if (cache_dirty) - flush_cache(); - return clean_merge; } @@ -1133,6 +1128,8 @@ static int merge_trees(struct tree *head, if (!process_entry(path, e, branch1, branch2)) clean = 0; } + if (cache_dirty) + flush_cache(); path_list_clear(re_merge, 0); path_list_clear(re_head, 0); -- cgit v0.10.2-6-g49f6