diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-07-09 09:23:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 11:55:53 -0700 |
| commit | 044fb190f75cdec35e56bde30ec214ab144311d9 (patch) | |
| tree | d49335dcfdbe0f83c3c5558eb3bc8b26c2770ffd /t/t4033-diff-patience.sh | |
| parent | a5229cc95103fab9449bf198a8a119482a8f0845 (diff) | |
| download | git-044fb190f75cdec35e56bde30ec214ab144311d9.tar.gz | |
diff: fix a double off-by-one with --ignore-space-at-eoljs/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>
Diffstat (limited to 't/t4033-diff-patience.sh')
| -rwxr-xr-x | t/t4033-diff-patience.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh index 5f0d0b164c..113304dc59 100755 --- 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 \ |