Fourth batch

diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
index 53905a222738d9fef0cdc79108a241ec3ee5a042..7683515155497d9303f319b31c3a49fb6610706f 100755 (executable)
--- a/t/t8006-blame-textconv.sh
+++ b/t/t8006-blame-textconv.sh
@@ -10,7 +10,7 @@ find_blame() {
 cat >helper <<'EOF'
 #!/bin/sh
 grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; }
-sed 's/^bin: /converted: /' "$1"
+"$PERL_PATH" -p -e 's/^bin: /converted: /' "$1"
 EOF
 chmod +x helper
 
@@ -18,16 +18,13 @@ 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
-               ln -s one.bin symlink.bin
-       fi &&
+       test_ln_s_add one.bin symlink.bin &&
        git add . &&
        GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
        echo "bin: test 1 version 2" >one.bin &&
        echo "bin: test number 2 version 2" >>two.bin &&
-       if test_have_prereq SYMLINKS; then
-               ln -sf two.bin symlink.bin
-       fi &&
+       rm -f symlink.bin &&
+       test_ln_s_add two.bin symlink.bin &&
        GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
 '
 
@@ -84,6 +81,27 @@ test_expect_success 'blame --textconv with local changes' '
        expr "$(find_blame <blame)" : "^$expect"
 '
 
+test_expect_success 'setup +cachetextconv' '
+       git config diff.test.cachetextconv true
+'
+
+cat >expected_one <<EOF
+(Number2 2010-01-01 20:00:00 +0000 1) converted: test 1 version 2
+EOF
+
+test_expect_success 'blame --textconv works with textconvcache' '
+       git blame --textconv two.bin >blame &&
+       find_blame <blame >result &&
+       test_cmp expected result &&
+       git blame --textconv one.bin >blame &&
+       find_blame  <blame >result &&
+       test_cmp expected_one result
+'
+
+test_expect_success 'setup -cachetextconv' '
+       git config diff.test.cachetextconv false
+'
+
 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"
@@ -113,7 +131,7 @@ test_expect_success SYMLINKS 'blame --textconv (on symlink)' '
 
 # cp two.bin three.bin  and make small tweak
 # (this will direct blame -C -C three.bin to consider two.bin and symlink.bin)
-test_expect_success SYMLINKS 'make another new commit' '
+test_expect_success 'make another new commit' '
        cat >three.bin <<\EOF &&
 bin: test number 2
 bin: test number 2 version 2
@@ -124,7 +142,7 @@ EOF
        GIT_AUTHOR_NAME=Number4 git commit -a -m Fourth --date="2010-01-01 23:00:00"
 '
 
-test_expect_success SYMLINKS 'blame on last commit (-C -C, symlink)' '
+test_expect_success 'blame on last commit (-C -C, symlink)' '
        git blame -C -C three.bin >blame &&
        find_blame <blame >result &&
        cat >expected <<\EOF &&