diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:43:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:43:00 -0700 |
| commit | d9ac3e41c37ea565d8227d942b4f468616c9813a (patch) | |
| tree | 7ff9e5e77766fa3f0fae8cea269cb285939a19ef /t | |
| parent | 05318994e7fcb6a652a8329bf7ba7f8d6696ee3c (diff) | |
| parent | 42536dd9b9829b4eb4e3706e141b3c8bffa3e826 (diff) | |
| download | git-d9ac3e41c37ea565d8227d942b4f468616c9813a.tar.gz git-d9ac3e41c37ea565d8227d942b4f468616c9813a.tar.xz | |
Merge branch 'jm/maint-diff-words-with-sbe' into maint
* jm/maint-diff-words-with-sbe:
do not read beyond end of malloc'd buffer
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4034-diff-words.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 37aeab0d5..c374aa4c1 100755 --- a/t/t4034-diff-words.sh +++ b/t/t4034-diff-words.sh @@ -307,4 +307,30 @@ test_language_driver python test_language_driver ruby test_language_driver tex +test_expect_success 'word-diff with diff.sbe' ' + cat >expect <<-\EOF && + diff --git a/pre b/post + index a1a53b5..bc8fe6d 100644 + --- a/pre + +++ b/post + @@ -1,3 +1,3 @@ + a + + [-b-]{+c+} + EOF + cat >pre <<-\EOF && + a + + b + EOF + cat >post <<-\EOF && + a + + c + EOF + test_when_finished "git config --unset diff.suppress-blank-empty" && + git config diff.suppress-blank-empty true && + word_diff --word-diff=plain +' + test_done |