From d0e4d791cef8b307b32954a8b80c4aabd41755a9 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Thu, 4 Jan 2007 11:22:47 +0100 Subject: Speedup recursive by flushing index only once for all entries Signed-off-by: Alex Riesen --- merge-recursive.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index bac16f5..4d3a2ce 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1083,9 +1083,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 +1130,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); -- 1.5.0.rc0.g8bc4b-dirty