kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: demonstrate a bug with --patience and --ignore-space-at-eol 

When a single character is added to a line, the combination of these
two options results in an empty diff.

This bug was noticed and reported by Naja Melan.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2016-07-09 09:23:50 +02:00 committed by Junio C Hamano
parent 765428699a
commit a5229cc951
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t4033-diff-patience.sh
View File

@ -5,6 +5,14 @@ test_description='patience diff algorithm'
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-alternative.sh . "$TEST_DIRECTORY"/lib-diff-alternative.sh


test_expect_failure '--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_frobnitz "patience"


test_diff_unique "patience" test_diff_unique "patience"