(squash) test for previous

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
index dbf623bce5598860800fa463c26ec8145d6e2400..53905a222738d9fef0cdc79108a241ec3ee5a042 100755 (executable)
--- a/t/t8006-blame-textconv.sh
+++ b/t/t8006-blame-textconv.sh
@@ -15,6 +15,7 @@ EOF
 chmod +x helper
 
 test_expect_success 'setup ' '
 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
        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 &&
 
 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
 '
        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_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"
 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"