[PATCH] Mode only changes from diff.
This fixes another bug.
- Mode-only changes were pruned incorrectly from the output.
- Added test to catch the above problem.
- Normalize rename/copy similarity score in the diff-raw output
to per-cent, no matter what scale we internally use.
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 8e3f495..dd4b4ff 100644
--- a/diff.c
+++ b/diff.c
@@ -517,7 +517,8 @@
switch (p->status) {
case 'C': case 'R':
two_paths = 1;
- sprintf(status, "%c%1d", p->status, p->score);
+ sprintf(status, "%c%03d", p->status,
+ (int)(0.5 + p->score * 100.0/MAX_SCORE));
break;
default:
two_paths = 0;
@@ -750,7 +751,8 @@
if (!p->status)
p->status = 'R';
}
- else if (memcmp(p->one->sha1, p->two->sha1, 20))
+ else if (memcmp(p->one->sha1, p->two->sha1, 20) ||
+ p->one->mode != p->two->mode)
p->status = 'M';
else
/* this is a "no-change" entry */
