044fb190f7
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>
21 lines
436 B
Bash
Executable File
21 lines
436 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='patience diff algorithm'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-diff-alternative.sh
|
|
|
|
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 \
|
|
--patience --ignore-space-at-eol pre post >diff &&
|
|
grep "^+.*X" diff
|
|
'
|
|
|
|
test_diff_frobnitz "patience"
|
|
|
|
test_diff_unique "patience"
|
|
|
|
test_done
|