From: Junio C Hamano <junkio@cox.net>
Date: Sun, 12 Jun 2005 03:55:20 +0000 (-0700)
Subject: [PATCH] Fix rename/copy when dealing with temporarily broken pairs.
X-Git-Tag: v0.99~288
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2210100ac00b8a46f1d94c044391bfa50b25afa4;p=git.git

[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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/diff.c b/diff.c
index dd1c0b6d5..d6661f826 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);
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 19325f245..8fb45f0b8 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -249,8 +249,14 @@ void diffcore_rename(int detect_rename, int minimum_score)
 				continue; /* unmerged */
 			else
 				locate_rename_dst(p->two, 1);
-		else if (!DIFF_FILE_VALID(p->two))
-			register_rename_src(p->one, 0);
+		else if (!DIFF_FILE_VALID(p->two)) {
+			/* If the source is a broken "delete", and
+			 * they did not really want to get broken,
+			 * that means the source actually stays.
+			 */
+			int stays = (p->broken_pair && !p->score);
+			register_rename_src(p->one, stays);
+		}
 		else if (detect_rename == DIFF_DETECT_COPY)
 			register_rename_src(p->one, 1);
 	}