diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:35 -0700 |
| commit | a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d (patch) | |
| tree | e095fccfca6cd9d67981a5672f7f7df5629ad9cf /t | |
| parent | 71076e11cda645c08f5c9f269e02ed28e47d5c4a (diff) | |
| parent | 044fb190f75cdec35e56bde30ec214ab144311d9 (diff) | |
| download | git-a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d.tar.gz | |
Merge branch 'js/ignore-space-at-eol' into maint
An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.
* js/ignore-space-at-eol:
diff: fix a double off-by-one with --ignore-space-at-eol
diff: demonstrate a bug with --patience and --ignore-space-at-eol
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..113304dc59 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_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" |