[PATCH] Ignore merged status of the file-level merge
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- Apr 26, 2007, 19:13 UTC
- Message-ID
- <20070426191349.GA9964@steel.home>
- In-Reply-To
- <20070425200659.GA30061@steel.home>
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> ---
merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index 094ac59..8f72b2c 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) /*
-- 1.5.2.rc0.65.g92b0b