path: root/Documentation/diff-format.txt
diff options
authorJunio C Hamano <>2005-05-29 23:54:59 (GMT)
committerLinus Torvalds <>2005-05-30 17:35:49 (GMT)
commitddafa7e93325d45cd4bd950dd8e89ff3188d0250 (patch)
tree61db38734c639c161a70781c9e56a790eb5d8ac0 /Documentation/diff-format.txt
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 'Documentation/diff-format.txt')
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index f85a605..1d92a01 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -36,7 +36,7 @@ That is, from the left to the right:
(6) sha1 for "src"; 0{40} if creation or unmerged.
(7) a space.
(8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
- (9) status, followed by similarlity index number only for C and R.
+ (9) status, followed by optional "score" number.
(10) a tab or a NUL when '-z' option is used.
(11) path for "src"
(12) a tab or a NUL when '-z' option is used; only exists for C or R.