From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 26 Apr 2007 19:13:49 +0000 (+0200)
Subject: Ignore merged status of the file-level merge
X-Git-Tag: v1.5.2-rc1~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0d5e6c9781aae33795243452fd50663d17ec2b9d;p=git.git

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 <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 094ac59e6..8f72b2c07 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)
 					/*