From 2210100ac00b8a46f1d94c044391bfa50b25afa4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Jun 2005 20:55:20 -0700 Subject: [PATCH] Fix rename/copy when dealing with temporarily broken pairs. When rename/copy uses a file that was broken by diffcore-break as the source, and the broken filepair gets merged back later, the output was mislabeled as a rename. In this case, the source file ends up staying in the output, so we should label it as a copy instead. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff.c | 1 + 1 file changed, 1 insertion(+) (limited to 'diff.c') diff --git a/diff.c b/diff.c index dd1c0b6d55..d6661f8268 100644 --- a/diff.c +++ b/diff.c @@ -662,6 +662,7 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue, dp->one = one; dp->two = two; dp->score = 0; + dp->status = 0; dp->source_stays = 0; dp->broken_pair = 0; diff_q(queue, dp); -- cgit v1.2.1