From 0d5e6c9781aae33795243452fd50663d17ec2b9d Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Thu, 26 Apr 2007 21:13:49 +0200 Subject: Ignore merged status of the file-level merge as it is not relevant for whether the result should be written. Even if no real merge happened, there might be _no_ reason to rewrite the working tree file. Maybe even more so. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 094ac59e69..8f72b2c079 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1342,7 +1342,7 @@ static int process_renames(struct path_list *a_renames, mfi = merge_file(o, a, b, a_branch, b_branch); - if (mfi.merge && mfi.clean && + if (mfi.clean && sha_eq(mfi.sha, ren1->pair->two->sha1) && mfi.mode == ren1->pair->two->mode) /* -- cgit v1.2.3