summaryrefslogtreecommitdiff
path: root/t/t8006-blame-textconv.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-01 22:20:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-01 22:20:28 (GMT)
commitb919f8404a9e212b3b9d602d4060e440072a0303 (patch)
treec8a2b04cb95fef931d7b75a5e6bdc0db32ac4d79 /t/t8006-blame-textconv.sh
parent7406aa203ff0571815fc472486ae7271049185e6 (diff)
parent55e7c0aaa1b2c00d147b1b4b1aa88a71d90dacf4 (diff)
downloadgit-b919f8404a9e212b3b9d602d4060e440072a0303.zip
git-b919f8404a9e212b3b9d602d4060e440072a0303.tar.gz
git-b919f8404a9e212b3b9d602d4060e440072a0303.tar.bz2
Merge branch 'ss/blame-textconv-fake-working-tree'
* ss/blame-textconv-fake-working-tree: (squash) test for previous blame.c: Properly initialize strbuf after calling, textconv_object() Conflicts: t/t8006-blame-textconv.sh
Diffstat (limited to 't/t8006-blame-textconv.sh')
-rwxr-xr-xt/t8006-blame-textconv.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
index 32ec82a..4ee42f1 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
@@ -43,6 +44,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
'
@@ -74,6 +76,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 'setup +cachetextconv' '
git config diff.test.cachetextconv true
'