t1450 (fsck): remove dangling objects
The fsck test is generally careful to remove the corrupt objects it inserts, but dangling objects are left behind due to some typos and omissions. It is better to clean up more completely, to simplify the addition of later tests. So: - guard setup and cleanup with test_expect_success to catch typos and errors; - check both stdout and stderr when checking for empty fsck output; - use test_cmp empty file in place of test $(wc -l <file) = 0, for better debugging output when running tests with -v; - add a remove_object () helper and use it to replace broken object removal code that forgot about the fanout in .git/objects; - disable gc.auto, to avoid tripping up object removal if the number of objects ever reaches that threshold. - use test_when_finished to ensure cleanup tasks are run and succeed when tests fail; - add a new final test that no breakage or dangling objects was left behind. While at it, add a brief description to test_description of the history that is expected to persist between tests. Part of a campaign to clean up subshell usage in tests. Cc: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
18a8269242
commit
dbedf8bf42
104
t/t1450-fsck.sh
104
t/t1450-fsck.sh
@ -1,21 +1,23 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
test_description='git fsck random collection of tests'
|
test_description='git fsck random collection of tests
|
||||||
|
|
||||||
|
* (HEAD) B
|
||||||
|
* (master) A
|
||||||
|
'
|
||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
test_expect_success setup '
|
test_expect_success setup '
|
||||||
|
git config gc.auto 0 &&
|
||||||
git config i18n.commitencoding ISO-8859-1 &&
|
git config i18n.commitencoding ISO-8859-1 &&
|
||||||
test_commit A fileA one &&
|
test_commit A fileA one &&
|
||||||
git config --unset i18n.commitencoding &&
|
git config --unset i18n.commitencoding &&
|
||||||
git checkout HEAD^0 &&
|
git checkout HEAD^0 &&
|
||||||
test_commit B fileB two &&
|
test_commit B fileB two &&
|
||||||
git tag -d A B &&
|
git tag -d A B &&
|
||||||
git reflog expire --expire=now --all
|
git reflog expire --expire=now --all &&
|
||||||
'
|
>empty
|
||||||
|
|
||||||
test_expect_success 'HEAD is part of refs' '
|
|
||||||
test 0 = $(git fsck | wc -l)
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'loose objects borrowed from alternate are not missing' '
|
test_expect_success 'loose objects borrowed from alternate are not missing' '
|
||||||
@ -25,75 +27,91 @@ test_expect_success 'loose objects borrowed from alternate are not missing' '
|
|||||||
git init &&
|
git init &&
|
||||||
echo ../../../.git/objects >.git/objects/info/alternates &&
|
echo ../../../.git/objects >.git/objects/info/alternates &&
|
||||||
test_commit C fileC one &&
|
test_commit C fileC one &&
|
||||||
git fsck >out &&
|
git fsck >../out 2>&1
|
||||||
! grep "missing blob" out
|
) &&
|
||||||
)
|
{
|
||||||
|
grep -v dangling out >actual ||
|
||||||
|
:
|
||||||
|
} &&
|
||||||
|
test_cmp empty actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'valid objects appear valid' '
|
test_expect_success 'HEAD is part of refs, valid objects appear valid' '
|
||||||
{ git fsck 2>out; true; } &&
|
git fsck >actual 2>&1 &&
|
||||||
! grep error out &&
|
test_cmp empty actual
|
||||||
! grep fatal out
|
|
||||||
'
|
'
|
||||||
|
|
||||||
# Corruption tests follow. Make sure to remove all traces of the
|
# Corruption tests follow. Make sure to remove all traces of the
|
||||||
# specific corruption you test afterwards, lest a later test trip over
|
# specific corruption you test afterwards, lest a later test trip over
|
||||||
# it.
|
# it.
|
||||||
|
|
||||||
|
test_expect_success 'setup: helpers for corruption tests' '
|
||||||
|
sha1_file() {
|
||||||
|
echo "$*" | sed "s#..#.git/objects/&/#"
|
||||||
|
} &&
|
||||||
|
|
||||||
|
remove_object() {
|
||||||
|
file=$(sha1_file "$*") &&
|
||||||
|
test -e "$file" &&
|
||||||
|
rm -f "$file"
|
||||||
|
}
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'object with bad sha1' '
|
test_expect_success 'object with bad sha1' '
|
||||||
sha=$(echo blob | git hash-object -w --stdin) &&
|
sha=$(echo blob | git hash-object -w --stdin) &&
|
||||||
echo $sha &&
|
|
||||||
old=$(echo $sha | sed "s+^..+&/+") &&
|
old=$(echo $sha | sed "s+^..+&/+") &&
|
||||||
new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
|
new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
|
||||||
sha="$(dirname $new)$(basename $new)"
|
sha="$(dirname $new)$(basename $new)"
|
||||||
mv .git/objects/$old .git/objects/$new &&
|
mv .git/objects/$old .git/objects/$new &&
|
||||||
|
test_when_finished "remove_object $sha" &&
|
||||||
git update-index --add --cacheinfo 100644 $sha foo &&
|
git update-index --add --cacheinfo 100644 $sha foo &&
|
||||||
|
test_when_finished "git read-tree -u --reset HEAD" &&
|
||||||
tree=$(git write-tree) &&
|
tree=$(git write-tree) &&
|
||||||
|
test_when_finished "remove_object $tree" &&
|
||||||
cmt=$(echo bogus | git commit-tree $tree) &&
|
cmt=$(echo bogus | git commit-tree $tree) &&
|
||||||
|
test_when_finished "remove_object $cmt" &&
|
||||||
git update-ref refs/heads/bogus $cmt &&
|
git update-ref refs/heads/bogus $cmt &&
|
||||||
(git fsck 2>out; true) &&
|
test_when_finished "git update-ref -d refs/heads/bogus" &&
|
||||||
grep "$sha.*corrupt" out &&
|
|
||||||
rm -f .git/objects/$new &&
|
test_might_fail git fsck 2>out &&
|
||||||
git update-ref -d refs/heads/bogus &&
|
cat out &&
|
||||||
git read-tree -u --reset HEAD
|
grep "$sha.*corrupt" out
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'branch pointing to non-commit' '
|
test_expect_success 'branch pointing to non-commit' '
|
||||||
git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
|
git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
|
||||||
|
test_when_finished "git update-ref -d refs/heads/invalid" &&
|
||||||
git fsck 2>out &&
|
git fsck 2>out &&
|
||||||
grep "not a commit" out &&
|
cat out &&
|
||||||
git update-ref -d refs/heads/invalid
|
grep "not a commit" out
|
||||||
'
|
'
|
||||||
|
|
||||||
new=nothing
|
|
||||||
test_expect_success 'email without @ is okay' '
|
test_expect_success 'email without @ is okay' '
|
||||||
git cat-file commit HEAD >basis &&
|
git cat-file commit HEAD >basis &&
|
||||||
sed "s/@/AT/" basis >okay &&
|
sed "s/@/AT/" basis >okay &&
|
||||||
new=$(git hash-object -t commit -w --stdin <okay) &&
|
new=$(git hash-object -t commit -w --stdin <okay) &&
|
||||||
echo "$new" &&
|
test_when_finished "remove_object $new" &&
|
||||||
git update-ref refs/heads/bogus "$new" &&
|
git update-ref refs/heads/bogus "$new" &&
|
||||||
|
test_when_finished "git update-ref -d refs/heads/bogus" &&
|
||||||
git fsck 2>out &&
|
git fsck 2>out &&
|
||||||
cat out &&
|
cat out &&
|
||||||
! grep "error in commit $new" out
|
! grep "commit $new" out
|
||||||
'
|
'
|
||||||
git update-ref -d refs/heads/bogus
|
|
||||||
rm -f ".git/objects/$new"
|
|
||||||
|
|
||||||
new=nothing
|
|
||||||
test_expect_success 'email with embedded > is not okay' '
|
test_expect_success 'email with embedded > is not okay' '
|
||||||
git cat-file commit HEAD >basis &&
|
git cat-file commit HEAD >basis &&
|
||||||
sed "s/@[a-z]/&>/" basis >bad-email &&
|
sed "s/@[a-z]/&>/" basis >bad-email &&
|
||||||
new=$(git hash-object -t commit -w --stdin <bad-email) &&
|
new=$(git hash-object -t commit -w --stdin <bad-email) &&
|
||||||
echo "$new" &&
|
test_when_finished "remove_object $new" &&
|
||||||
git update-ref refs/heads/bogus "$new" &&
|
git update-ref refs/heads/bogus "$new" &&
|
||||||
|
test_when_finished "git update-ref -d refs/heads/bogus" &&
|
||||||
git fsck 2>out &&
|
git fsck 2>out &&
|
||||||
cat out &&
|
cat out &&
|
||||||
grep "error in commit $new" out
|
grep "error in commit $new" out
|
||||||
'
|
'
|
||||||
git update-ref -d refs/heads/bogus
|
|
||||||
rm -f ".git/objects/$new"
|
|
||||||
|
|
||||||
cat > invalid-tag <<EOF
|
test_expect_success 'tag pointing to nonexistent' '
|
||||||
|
cat >invalid-tag <<-\EOF
|
||||||
object ffffffffffffffffffffffffffffffffffffffff
|
object ffffffffffffffffffffffffffffffffffffffff
|
||||||
type commit
|
type commit
|
||||||
tag invalid
|
tag invalid
|
||||||
@ -102,17 +120,20 @@ tagger T A Gger <tagger@example.com> 1234567890 -0000
|
|||||||
This is an invalid tag.
|
This is an invalid tag.
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_expect_success 'tag pointing to nonexistent' '
|
|
||||||
tag=$(git hash-object -t tag -w --stdin <invalid-tag) &&
|
tag=$(git hash-object -t tag -w --stdin <invalid-tag) &&
|
||||||
|
test_when_finished "remove_object $tag" &&
|
||||||
echo $tag >.git/refs/tags/invalid &&
|
echo $tag >.git/refs/tags/invalid &&
|
||||||
|
test_when_finished "git update-ref -d refs/tags/invalid" &&
|
||||||
test_must_fail git fsck --tags >out &&
|
test_must_fail git fsck --tags >out &&
|
||||||
cat out &&
|
cat out &&
|
||||||
grep "broken link" out &&
|
grep "broken link" out
|
||||||
rm .git/refs/tags/invalid
|
|
||||||
'
|
'
|
||||||
|
|
||||||
cat > wrong-tag <<EOF
|
test_expect_success 'tag pointing to something else than its type' '
|
||||||
object $(echo blob | git hash-object -w --stdin)
|
sha=$(echo blob | git hash-object -w --stdin) &&
|
||||||
|
test_when_finished "remove_object $sha" &&
|
||||||
|
cat >wrong-tag <<-EOF &&
|
||||||
|
object $sha
|
||||||
type commit
|
type commit
|
||||||
tag wrong
|
tag wrong
|
||||||
tagger T A Gger <tagger@example.com> 1234567890 -0000
|
tagger T A Gger <tagger@example.com> 1234567890 -0000
|
||||||
@ -120,15 +141,18 @@ tagger T A Gger <tagger@example.com> 1234567890 -0000
|
|||||||
This is an invalid tag.
|
This is an invalid tag.
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_expect_success 'tag pointing to something else than its type' '
|
|
||||||
tag=$(git hash-object -t tag -w --stdin <wrong-tag) &&
|
tag=$(git hash-object -t tag -w --stdin <wrong-tag) &&
|
||||||
|
test_when_finished "remove_object $tag" &&
|
||||||
echo $tag >.git/refs/tags/wrong &&
|
echo $tag >.git/refs/tags/wrong &&
|
||||||
|
test_when_finished "git update-ref -d refs/tags/wrong" &&
|
||||||
test_must_fail git fsck --tags 2>out &&
|
test_must_fail git fsck --tags 2>out &&
|
||||||
cat out &&
|
cat out &&
|
||||||
grep "error in tag.*broken links" out &&
|
grep "error in tag.*broken links" out
|
||||||
rm .git/refs/tags/wrong
|
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'cleaned up' '
|
||||||
|
git fsck >actual 2>&1 &&
|
||||||
|
test_cmp empty actual
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user