undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(squash) test for previous

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-10-28 09:36:55 -07:00
parent 2564aa48ce
commit 55e7c0aaa1
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/t8006-blame-textconv.sh
View File

@ -15,6 +15,7 @@ EOF
chmod +x helper chmod +x helper
test_expect_success 'setup ' ' test_expect_success 'setup ' '
echo "bin: test number 0" >zero.bin &&
echo "bin: test 1" >one.bin && echo "bin: test 1" >one.bin &&
echo "bin: test number 2" >two.bin && echo "bin: test number 2" >two.bin &&
if test_have_prereq SYMLINKS; then if test_have_prereq SYMLINKS; then
@ -42,6 +43,7 @@ test_expect_success 'no filter specified' '
test_expect_success 'setup textconv filters' ' test_expect_success 'setup textconv filters' '
echo "*.bin diff=test" >.gitattributes && echo "*.bin diff=test" >.gitattributes &&
echo "zero.bin eol=crlf" >>.gitattributes &&
git config diff.test.textconv ./helper && git config diff.test.textconv ./helper &&
git config diff.test.cachetextconv false 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' ' test_expect_success 'make a new commit' '
echo "bin: test number 2 version 3" >>two.bin && 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" GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00"