From 900647104e02e545064789f3c6b90a5807fba07b Mon Sep 17 00:00:00 2001 From: Kirill Smelkov Date: Wed, 29 Sep 2010 15:35:24 +0400 Subject: blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' We need to get the correct mode when blame reads the source from the working tree, the index, or trees. This allows us to omit running textconv filters on symbolic links. Signed-off-by: Kirill Smelkov Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano --- t/t8006-blame-textconv.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 't/t8006-blame-textconv.sh') diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index 7c35959b44..dbf623bce5 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -94,8 +94,7 @@ test_expect_success SYMLINKS 'blame with --no-textconv (on symlink)' ' test_cmp expected result ' -# fails with '...symlink.bin is not "binary" file' -test_expect_failure SYMLINKS 'blame --textconv (on symlink)' ' +test_expect_success SYMLINKS 'blame --textconv (on symlink)' ' git blame --textconv symlink.bin >blame && find_blame result && test_cmp expected result @@ -114,8 +113,7 @@ EOF GIT_AUTHOR_NAME=Number4 git commit -a -m Fourth --date="2010-01-01 23:00:00" ' -# fails with '...symlink.bin is not "binary" file' -test_expect_failure SYMLINKS 'blame on last commit (-C -C, symlink)' ' +test_expect_success SYMLINKS 'blame on last commit (-C -C, symlink)' ' git blame -C -C three.bin >blame && find_blame result && cat >expected <<\EOF && -- cgit v1.2.3