diff options
| author | Kirill Smelkov <kirr@landau.phys.spbu.ru> | 2010-09-29 15:35:24 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 16:53:25 -0700 |
| commit | 900647104e02e545064789f3c6b90a5807fba07b (patch) | |
| tree | 18afcf6ef450617cf0944058d40fe9e14c93312a /t | |
| parent | ab3b7b9a6e3bf5793520f06eb76fb03ffe8231cb (diff) | |
| download | git-900647104e02e545064789f3c6b90a5807fba07b.tar.gz git-900647104e02e545064789f3c6b90a5807fba07b.tar.xz | |
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 <kirr@landau.phys.spbu.ru>
Reviewed-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8006-blame-textconv.sh | 6 | ||||
| -rwxr-xr-x | t/t8007-cat-file-textconv.sh | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index 7c35959b4..dbf623bce 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 <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 <blame >result && cat >expected <<\EOF && diff --git a/t/t8007-cat-file-textconv.sh b/t/t8007-cat-file-textconv.sh index 98a3e1f57..78a0085e6 100755 --- a/t/t8007-cat-file-textconv.sh +++ b/t/t8007-cat-file-textconv.sh @@ -79,8 +79,7 @@ test_expect_success SYMLINKS 'cat-file without --textconv (symlink)' ' ' -# fails because cat-file tries to run converter on symlink.bin -test_expect_failure SYMLINKS 'cat-file --textconv on index (symlink)' ' +test_expect_success SYMLINKS 'cat-file --textconv on index (symlink)' ' ! git cat-file --textconv :symlink.bin 2>result && cat >expected <<\EOF && fatal: git cat-file --textconv: unable to run textconv on :symlink.bin @@ -88,8 +87,7 @@ EOF test_cmp expected result ' -# fails because cat-file tries to run converter on symlink.bin -test_expect_failure SYMLINKS 'cat-file --textconv on HEAD (symlink)' ' +test_expect_success SYMLINKS 'cat-file --textconv on HEAD (symlink)' ' ! git cat-file --textconv HEAD:symlink.bin 2>result && cat >expected <<EOF && fatal: git cat-file --textconv: unable to run textconv on HEAD:symlink.bin |