mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
6789275d37
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
134 lines
4.1 KiB
Bash
Executable File
134 lines
4.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git rev-list should handle unexpected object types'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup well-formed objects' '
|
|
blob="$(printf "foo" | git hash-object -w --stdin)" &&
|
|
tree="$(printf "100644 blob $blob\tfoo" | git mktree)" &&
|
|
commit="$(git commit-tree $tree -m "first commit")" &&
|
|
git cat-file commit $commit >good-commit
|
|
'
|
|
|
|
test_expect_success 'setup unexpected non-blob entry' '
|
|
printf "100644 foo\0$(echo $tree | hex2oct)" >broken-tree &&
|
|
broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
|
|
'
|
|
|
|
test_expect_success 'TODO (should fail!): traverse unexpected non-blob entry (lone)' '
|
|
sed "s/Z$//" >expect <<-EOF &&
|
|
$broken_tree Z
|
|
$tree foo
|
|
EOF
|
|
git rev-list --objects $broken_tree >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-blob entry (seen)' '
|
|
test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
|
|
test_grep "is not a blob" output
|
|
'
|
|
|
|
test_expect_success 'setup unexpected non-tree entry' '
|
|
printf "40000 foo\0$(echo $blob | hex2oct)" >broken-tree &&
|
|
broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-tree entry (lone)' '
|
|
test_must_fail git rev-list --objects $broken_tree
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-tree entry (seen)' '
|
|
test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
|
|
test_grep "is not a tree" output
|
|
'
|
|
|
|
test_expect_success 'setup unexpected non-commit parent' '
|
|
sed "/^author/ { h; s/.*/parent $blob/; G; }" <good-commit \
|
|
>broken-commit &&
|
|
broken_commit="$(git hash-object -w --literally -t commit \
|
|
broken-commit)"
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-commit parent (lone)' '
|
|
test_must_fail git rev-list --objects $broken_commit >output 2>&1 &&
|
|
test_grep "not a commit" output
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-commit parent (seen)' '
|
|
test_must_fail git rev-list --objects $blob $broken_commit \
|
|
>output 2>&1 &&
|
|
test_grep "not a commit" output
|
|
'
|
|
|
|
test_expect_success 'setup unexpected non-tree root' '
|
|
sed -e "s/$tree/$blob/" <good-commit >broken-commit &&
|
|
broken_commit="$(git hash-object -w --literally -t commit \
|
|
broken-commit)"
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-tree root (lone)' '
|
|
test_must_fail git rev-list --objects $broken_commit
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-tree root (seen)' '
|
|
test_must_fail git rev-list --objects $blob $broken_commit \
|
|
>output 2>&1 &&
|
|
test_grep "not a tree" output
|
|
'
|
|
|
|
test_expect_success 'setup unexpected non-commit tag' '
|
|
git tag -a -m "tagged commit" tag $commit &&
|
|
git cat-file tag tag >good-tag &&
|
|
test_when_finished "git tag -d tag" &&
|
|
sed -e "s/$commit/$blob/" <good-tag >broken-tag &&
|
|
tag=$(git hash-object -w --literally -t tag broken-tag)
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-commit tag (lone)' '
|
|
test_must_fail git rev-list --objects $tag
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-commit tag (seen)' '
|
|
test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
|
|
test_grep "not a commit" output
|
|
'
|
|
|
|
test_expect_success 'setup unexpected non-tree tag' '
|
|
git tag -a -m "tagged tree" tag $tree &&
|
|
git cat-file tag tag >good-tag &&
|
|
test_when_finished "git tag -d tag" &&
|
|
sed -e "s/$tree/$blob/" <good-tag >broken-tag &&
|
|
tag=$(git hash-object -w --literally -t tag broken-tag)
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-tree tag (lone)' '
|
|
test_must_fail git rev-list --objects $tag
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-tree tag (seen)' '
|
|
test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
|
|
test_grep "not a tree" output
|
|
'
|
|
|
|
test_expect_success 'setup unexpected non-blob tag' '
|
|
git tag -a -m "tagged blob" tag $blob &&
|
|
git cat-file tag tag >good-tag &&
|
|
test_when_finished "git tag -d tag" &&
|
|
sed -e "s/$blob/$commit/" <good-tag >broken-tag &&
|
|
tag=$(git hash-object -w --literally -t tag broken-tag)
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-blob tag (lone)' '
|
|
test_must_fail git rev-list --objects $tag
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-blob tag (seen)' '
|
|
test_must_fail git rev-list --objects $commit $tag >output 2>&1 &&
|
|
test_grep "not a blob" output
|
|
'
|
|
|
|
test_done
|