diff: fix a double off-by-one with --ignore-space-at-eol
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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 9, 2016 at 09:23 UTC
044fb190f75cdec35e56bde30ec214ab144311d9
3 files changed
+6
-4
t/t4033-diff-patience.sh
+1
-1
@@ -5,7 +5,7 @@ test_description='patience diff algorithm'
5
. ./test-lib.sh
6
. "$TEST_DIRECTORY"/lib-diff-alternative.sh
7
8
-test_expect_failure '--ignore-space-at-eol with a single appended character' '
8
+test_expect_success '--ignore-space-at-eol with a single appended character' '
9
printf "a\nb\nc\n" >pre &&
10
printf "a\nbX\nc\n" >post &&
11
test_must_fail git diff --no-index \
xdiff/xpatience.c
+1
-1
@@ -1,6 +1,6 @@
1
/*
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
*
5
* This library is free software; you can redistribute it and/or
6
* modify it under the terms of the GNU Lesser General Public
xdiff/xutils.c
+4
-2
@@ -200,8 +200,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
200
return 0;
201
}
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
+ }
207
}
208
209
/*