mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
68c69f90c8
Add tests for the output that's emitted when we disambiguate
<obj>:<path> in cat-file. This gives us a baseline for improving these
messages.
For e.g. "git blame" we'll emit:
$ git blame HEAD:foo
fatal: no such path 'HEAD:foo' in HEAD
But cat-file doesn't disambiguate these two cases, and just gives the
rather unhelpful:
$ git cat-file --textconv HEAD:foo
fatal: Not a valid object name HEAD:foo
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
129 lines
3 KiB
Bash
Executable file
129 lines
3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git cat-file textconv support'
|
|
. ./test-lib.sh
|
|
|
|
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" >one.bin &&
|
|
test_ln_s_add one.bin symlink.bin &&
|
|
git add . &&
|
|
GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
|
|
echo "bin: test version 2" >one.bin &&
|
|
GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
|
|
'
|
|
|
|
test_expect_success 'usage: <bad rev>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: Not a valid object name HEAD2
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD2 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'usage: <bad rev>:<bad path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: Not a valid object name HEAD2:two.bin
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'usage: <rev>:<bad path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: Not a valid object name HEAD:two.bin
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
|
|
test_expect_success 'usage: <rev> with no <path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: git cat-file --textconv HEAD: <object> must be <sha1:path>
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
|
|
test_expect_success 'usage: <bad rev>:<good (in HEAD) path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: Not a valid object name HEAD2:one.bin
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
bin: test version 2
|
|
EOF
|
|
|
|
test_expect_success 'no filter specified' '
|
|
git cat-file --textconv :one.bin >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 'cat-file without --textconv' '
|
|
git cat-file blob :one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
bin: test
|
|
EOF
|
|
|
|
test_expect_success 'cat-file without --textconv on previous commit' '
|
|
git cat-file -p HEAD^:one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
converted: test version 2
|
|
EOF
|
|
|
|
test_expect_success 'cat-file --textconv on last commit' '
|
|
git cat-file --textconv :one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
converted: test
|
|
EOF
|
|
|
|
test_expect_success 'cat-file --textconv on previous commit' '
|
|
git cat-file --textconv HEAD^:one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'cat-file without --textconv (symlink)' '
|
|
printf "%s" "one.bin" >expected &&
|
|
git cat-file blob :symlink.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
|
|
test_expect_success 'cat-file --textconv on index (symlink)' '
|
|
git cat-file --textconv :symlink.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'cat-file --textconv on HEAD (symlink)' '
|
|
git cat-file --textconv HEAD:symlink.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_done
|