mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
![Jeff King](/assets/img/avatar_default.png)
When the traversal machinery sees a commit without a root tree, it assumes that the tree was part of a BOUNDARY commit, and quietly ignores the tree. But it could also be caused by a commit whose root tree is broken or missing. Instead, let's die() when we see a NULL root tree. We can differentiate it from the BOUNDARY case by seeing if the commit was actually parsed. This covers that case, plus future-proofs us against any others where we might try to show an unparsed commit. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
128 lines
4 KiB
Bash
Executable file
128 lines
4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git rev-list should handle unexpected object types'
|
|
|
|
. ./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_failure 'traverse unexpected non-blob entry (lone)' '
|
|
test_must_fail git rev-list --objects $broken_tree
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-blob entry (seen)' '
|
|
test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
|
|
test_i18ngrep "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_i18ngrep "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_i18ngrep "not a commit" output
|
|
'
|
|
|
|
test_expect_success 'traverse unexpected non-commit parent (seen)' '
|
|
test_must_fail git rev-list --objects $commit $broken_commit \
|
|
>output 2>&1 &&
|
|
test_i18ngrep "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_i18ngrep "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_i18ngrep "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_i18ngrep "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_failure '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_i18ngrep "not a blob" output
|
|
'
|
|
|
|
test_done
|