path: root/t/
diff options
authorJunio C Hamano <>2005-05-29 23:54:59 (GMT)
committerLinus Torvalds <>2005-05-30 17:35:49 (GMT)
commitddafa7e93325d45cd4bd950dd8e89ff3188d0250 (patch)
tree61db38734c639c161a70781c9e56a790eb5d8ac0 /t/
parentcad88fdf8d1ebafb5d4d1b92eb243ff86bae740b (diff)
[PATCH] diff-helper: Fix R/C score parsing under -z flag.
The score number that follow R/C status were parsed but the parse pointer was not updated, causing the entire line to become unrecognized. This patch fixes this problem. There was a test missing to catch this breakage, which this commit adds as The diff-raw tests used in related (the same test without -z) and were stricter than necessarily, despite that the comment for the tests said otherwise. This patch also corrects them. The documentation is updated to say that the status can optionally be followed by a number called "score"; it does not have to stay similarity index forever and there is no reason to limit it only to C and R. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 't/')
1 files changed, 1 insertions, 1 deletions
diff --git a/t/ b/t/
index 518892b..76ae720 100644
--- a/t/
+++ b/t/
@@ -10,7 +10,7 @@ test_description='Rename interaction with pathspec.
-sanitize_diff_raw='s/ \('"$_x40"'\) \1 \([CR]\)[0-9]* / \1 \1 \2# /'
+sanitize_diff_raw='s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]* / X X \1# /'
compare_diff_raw () {
# When heuristics are improved, the score numbers would change.
# Ignore them while comparing.