diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:48:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:50:44 -0700 |
| commit | 49d3536594e653717844d53825fa7c0a494888f7 (patch) | |
| tree | 35022ab151934461b2a9f21cce140b5a773369c6 /t/t4015-diff-whitespace.sh | |
| parent | 98fcf840af443a0a93b9a6cd1fada5af826383f3 (diff) | |
| parent | 5760a6b094736e6f59eb32c7abb4cdbb7fca1627 (diff) | |
| download | git-49d3536594e653717844d53825fa7c0a494888f7.tar.gz | |
Merge branch 'maint' to sync with 1.6.0.1
Diffstat (limited to 't/t4015-diff-whitespace.sh')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index f9eb67d835..fc2307eaa3 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -352,4 +352,20 @@ test_expect_success 'checkdiff allows new blank lines' ' git diff --check ' +test_expect_success 'combined diff with autocrlf conversion' ' + + git reset --hard && + echo >x hello && + git commit -m "one side" x && + git checkout HEAD^ && + echo >x goodbye && + git commit -m "the other side" x && + git config core.autocrlf true && + test_must_fail git merge master && + + git diff | sed -e "1,/^@@@/d" >actual && + ! grep "^-" actual + +' + test_done |