summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-11 20:55:20 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-12 20:40:19 -0700
commit2210100ac00b8a46f1d94c044391bfa50b25afa4 (patch)
tree76aeba1897c592e1965533a2cb8771671bd747ed /diff.c
parenta7fa68c5f942706fce5636b9136d1b229e089190 (diff)
downloadgit-2210100ac00b8a46f1d94c044391bfa50b25afa4.tar.gz
[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>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
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);