diff: fix a double off-by-one with --ignore-space-at-eol

dscho · gitster · commit 044fb190f75c · 2016-07-11T11:55:53.000-07:00
When comparing two lines, ignoring any whitespace at the end, we first
try to match as many bytes as possible and break out of the loop only
upon mismatch, to let the remainder be handled by the code shared with
the other whitespace-ignoring code paths.

When comparing the bytes, however, we incremented the counters always,
even if the bytes did not match. And because we fall through to  the
space-at-eol handling at that point, it is as if that mismatch never
happened.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh
@@ -5,7 +5,7 @@ test_description='patience diff algorithm'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff-alternative.sh
 
-test_expect_failure '--ignore-space-at-eol with a single appended character' '
+test_expect_success '--ignore-space-at-eol with a single appended character' '
 	printf "a\nb\nc\n" >pre &&
 	printf "a\nbX\nc\n" >post &&
 	test_must_fail git diff --no-index \
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
@@ -1,6 +1,6 @@
 /*
  *  LibXDiff by Davide Libenzi ( File Differential Library )
- *  Copyright (C) 2003-2009 Davide Libenzi, Johannes E. Schindelin
+ *  Copyright (C) 2003-2016 Davide Libenzi, Johannes E. Schindelin
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
@@ -200,8 +200,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
 				return 0;
 		}
 	} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {
-		while (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++])
-			; /* keep going */
+		while (i1 < s1 && i2 < s2 && l1[i1] == l2[i2]) {
+			i1++;
+			i2++;
+		}
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* LibXDiff by Davide Libenzi ( File Differential Library )`
`3`		`- * Copyright (C) 2003-2009 Davide Libenzi, Johannes E. Schindelin`
	`3`	`+ * Copyright (C) 2003-2016 Davide Libenzi, Johannes E. Schindelin`
`4`	`4`	`*`
`5`	`5`	`* This library is free software; you can redistribute it and/or`
`6`	`6`	`* modify it under the terms of the GNU Lesser General Public`
Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,10 @@ int xdl_recmatch(const char l1, long s1, const char l2, long s2, long flags)`
`200`	`200`	`return 0;`
`201`	`201`	`}`
`202`	`202`	`} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {`
`203`		`- while (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++])`
`204`		`- ; /* keep going */`
	`203`	`+ while (i1 < s1 && i2 < s2 && l1[i1] == l2[i2]) {`
	`204`	`+ i1++;`
	`205`	`+ i2++;`
	`206`	`+ }`
`205`	`207`	`}`
`206`	`208`
`207`	`209`	`/*`