diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:32:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:32:18 -0700 |
| commit | fb7092807962af168a76f6d8cbab02150daa0b5a (patch) | |
| tree | 07c57aa35c65acfc9b40e2abca17d4103699fe92 /t | |
| parent | 97e5f4908dd22c99e825ccb254f05a61fda8d19c (diff) | |
| parent | 5e568f9e3027797842807213ce590140c9daf9ce (diff) | |
| download | git-fb7092807962af168a76f6d8cbab02150daa0b5a.tar.gz git-fb7092807962af168a76f6d8cbab02150daa0b5a.tar.xz | |
Merge branch 'ag/maint-combine-diff-fix' into maint
* ag/maint-combine-diff-fix:
Respect core.autocrlf in combined diff
Diffstat (limited to 't')
| -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 ec98509fd..b1cbd36d1 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 |