diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-07-09 09:23:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-07-11 11:55:08 -0700 |
| commit | a5229cc95103fab9449bf198a8a119482a8f0845 (patch) | |
| tree | 3d371d9a45e3dbfafcd8da9396032e6252312ea4 /t | |
| parent | Git 2.4.11 (diff) | |
| download | tgif-a5229cc95103fab9449bf198a8a119482a8f0845.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4033-diff-patience.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh index 3c9932edf3..5f0d0b164c 100755 --- a/t/t4033-diff-patience.sh +++ b/t/t4033-diff-patience.sh @@ -5,6 +5,14 @@ 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' ' + 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" |