aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-04-26 21:13:49 +0200
committerJunio C Hamano <junkio@cox.net>2007-04-26 16:11:39 -0700
commit0d5e6c9781aae33795243452fd50663d17ec2b9d (patch)
tree0448c4e964b66fe838c83f60b38f01464c9c9547 /merge-recursive.c
parent8a359819273a4460d5806d2d5e76cd7993a84843 (diff)
downloadgit-0d5e6c9781aae33795243452fd50663d17ec2b9d.tar.gz
git-0d5e6c9781aae33795243452fd50663d17ec2b9d.tar.xz
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
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)
/*