diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-28 20:36:55 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-28 20:36:55 +0400 |
commit | 55e7c0aaa1b2c00d147b1b4b1aa88a71d90dacf4 (patch) | |
tree | a1fa8ab99372896e242ae27ab94642938f1fbde9 | |
parent | 2564aa48ce007ad265c0d31a7cb7513239447d2b (diff) |
(squash) test for previous
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | t/t8006-blame-textconv.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index dbf623bce5..53905a2227 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -15,6 +15,7 @@ EOF chmod +x helper test_expect_success 'setup ' ' + echo "bin: test number 0" >zero.bin && echo "bin: test 1" >one.bin && echo "bin: test number 2" >two.bin && if test_have_prereq SYMLINKS; then @@ -42,6 +43,7 @@ test_expect_success 'no filter specified' ' test_expect_success 'setup textconv filters' ' echo "*.bin diff=test" >.gitattributes && + echo "zero.bin eol=crlf" >>.gitattributes && git config diff.test.textconv ./helper && git config diff.test.cachetextconv false ' @@ -73,6 +75,15 @@ test_expect_success 'blame --textconv going through revisions' ' test_cmp expected result ' +test_expect_success 'blame --textconv with local changes' ' + test_when_finished "git checkout zero.bin" && + printf "bin: updated number 0\015" >zero.bin && + git blame --textconv zero.bin >blame && + expect="(Not Committed Yet ....-..-.. ..:..:.. +0000 1)" && + expect="$expect converted: updated number 0" && + expr "$(find_blame <blame)" : "^$expect" +' + test_expect_success 'make a new commit' ' echo "bin: test number 2 version 3" >>two.bin && GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00" |