summaryrefslogtreecommitdiff
path: root/diffcore-rename.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-29 23:56:48 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-30 17:35:49 (GMT)
commit01c4e70f637c0617e24d9a7abb7239e25de9a51d (patch)
tree0b519a6e1963b1b83e830593c41c14a6fe2547b9 /diffcore-rename.c
parentbefe86392c767b62e4a6498cf951faae6f2c5ea3 (diff)
downloadgit-01c4e70f637c0617e24d9a7abb7239e25de9a51d.zip
git-01c4e70f637c0617e24d9a7abb7239e25de9a51d.tar.gz
git-01c4e70f637c0617e24d9a7abb7239e25de9a51d.tar.bz2
[PATCH] diff: code clean-up and removal of rename hack.
A new macro, DIFF_PAIR_RENAME(), is introduced to distinguish a filepair that is a rename/copy (the definition of which is src and dst are different paths, of course). This removes the hack used in the record_rename_pair() to always put a non-zero value in the score field. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diffcore-rename.c')
-rw-r--r--diffcore-rename.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 035d4eb..cf3fe09 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -207,7 +207,7 @@ static void record_rename_pair(struct diff_queue_struct *renq,
fill_filespec(two, dst->sha1, dst->mode);
dp = diff_queue(renq, one, two);
- dp->score = score ? : 1; /* make sure it is at least 1 */
+ dp->score = score;
dp->source_stays = rename_src[src_index].src_stays;
rename_dst[dst_index].pair = dp;
}