mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
9ec09b0495
When blaming files in the working tree, the filespec is marked with !sha1_valid, as we have not given the contents an object name yet. The function to cache textconv results (keyed on the object name), however, didn't check this condition, and ended up on storing the cached result under a random object name. Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Cc: Clément Poulain <clement.poulain@ensimag.imag.fr> Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Cc: Jeff King <peff@peff.net> Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com>
149 lines
4 KiB
Bash
Executable file
149 lines
4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git blame textconv support'
|
|
. ./test-lib.sh
|
|
|
|
find_blame() {
|
|
sed -e 's/^[^(]*//'
|
|
}
|
|
|
|
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"
|
|
EOF
|
|
chmod +x helper
|
|
|
|
test_expect_success 'setup ' '
|
|
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 &&
|
|
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 &&
|
|
GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
(Number2 2010-01-01 20:00:00 +0000 1) bin: test 1 version 2
|
|
EOF
|
|
|
|
test_expect_success 'no filter specified' '
|
|
git blame one.bin >blame &&
|
|
find_blame Number2 <blame >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'setup textconv filters' '
|
|
echo "*.bin diff=test" >.gitattributes &&
|
|
git config diff.test.textconv ./helper &&
|
|
git config diff.test.cachetextconv false
|
|
'
|
|
|
|
test_expect_success 'blame with --no-textconv' '
|
|
git blame --no-textconv one.bin >blame &&
|
|
find_blame <blame> result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
(Number2 2010-01-01 20:00:00 +0000 1) converted: test 1 version 2
|
|
EOF
|
|
|
|
test_expect_success 'basic blame on last commit' '
|
|
git blame one.bin >blame &&
|
|
find_blame <blame >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
(Number1 2010-01-01 18:00:00 +0000 1) converted: test number 2
|
|
(Number2 2010-01-01 20:00:00 +0000 2) converted: test number 2 version 2
|
|
EOF
|
|
|
|
test_expect_success 'blame --textconv going through revisions' '
|
|
git blame --textconv two.bin >blame &&
|
|
find_blame <blame >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
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"
|
|
'
|
|
|
|
test_expect_success 'blame from previous revision' '
|
|
git blame HEAD^ two.bin >blame &&
|
|
find_blame <blame >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
(Number2 2010-01-01 20:00:00 +0000 1) two.bin
|
|
EOF
|
|
|
|
test_expect_success SYMLINKS 'blame with --no-textconv (on symlink)' '
|
|
git blame --no-textconv symlink.bin >blame &&
|
|
find_blame <blame >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'blame --textconv (on symlink)' '
|
|
git blame --textconv symlink.bin >blame &&
|
|
find_blame <blame >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
# 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' '
|
|
cat >three.bin <<\EOF &&
|
|
bin: test number 2
|
|
bin: test number 2 version 2
|
|
bin: test number 2 version 3
|
|
bin: test number 3
|
|
EOF
|
|
git add three.bin &&
|
|
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)' '
|
|
git blame -C -C three.bin >blame &&
|
|
find_blame <blame >result &&
|
|
cat >expected <<\EOF &&
|
|
(Number1 2010-01-01 18:00:00 +0000 1) converted: test number 2
|
|
(Number2 2010-01-01 20:00:00 +0000 2) converted: test number 2 version 2
|
|
(Number3 2010-01-01 22:00:00 +0000 3) converted: test number 2 version 3
|
|
(Number4 2010-01-01 23:00:00 +0000 4) converted: test number 3
|
|
EOF
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_done
|