A few of the tests create intentionally broken objects with broken types. Let's clean them up after we're done with them, so that later tests don't get confused (we hadn't noticed because this only affects tests which use --batch-all-objects, but I'm about to add more). Signed-off-by: Jeff King <peff@xxxxxxxx> --- I was puzzled why the existing --batch-all-objects tests didn't get confused by this, but it's because they operate in a sub-repo. My new tests _could_ do that, too, but this seemed like confusion waiting to happen. t/t1006-cat-file.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index 18b3779ccb..c77db35728 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -331,6 +331,11 @@ test_expect_success "Size of broken object is correct" ' git cat-file -s --allow-unknown-type $bogus_sha1 >actual && test_cmp expect actual ' + +test_expect_success 'clean up broken object' ' + rm .git/objects/$(test_oid_to_path $bogus_sha1) +' + bogus_type="abcdefghijklmnopqrstuvwxyz1234679" bogus_content="bogus" bogus_size=$(strlen "$bogus_content") @@ -348,6 +353,10 @@ test_expect_success "Size of large broken object is correct when type is large" test_cmp expect actual ' +test_expect_success 'clean up broken object' ' + rm .git/objects/$(test_oid_to_path $bogus_sha1) +' + # Tests for git cat-file --follow-symlinks test_expect_success 'prep for symlink tests' ' echo_without_newline "$hello_content" >morx && -- 2.33.0.1231.g45ae28b974
