mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore merged status of the file-level merge

Browse Source 
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>
This commit is contained in:
Alex Riesen
2007-04-26 21:13:49 +02:00
committed by Junio C Hamano
parent 8a35981927
commit 0d5e6c9781
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -1342,7 +1342,7 @@ static int process_renames(struct path_list *a_renames,
mfi = merge_file(o, a, b, mfi = merge_file(o, a, b,
a_branch, b_branch); a_branch, b_branch);
if (mfi.merge && mfi.clean && if (mfi.clean &&
sha_eq(mfi.sha, ren1->pair->two->sha1) && sha_eq(mfi.sha, ren1->pair->two->sha1) &&
mfi.mode == ren1->pair->two->mode) mfi.mode == ren1->pair->two->mode)
/* /*