As noted in the preceding commit we weren't handling cases where we
see a reference to a bad "type" in a "tag", but then end up not fully
parsing the object.
In those cases let's only claim that we have a bad tag pointer, but
emit "is a %s, not a %s".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
t/t6102-rev-list-unexpected-objects.sh | 6 +++---
tag.c | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index 2e36d8bcfd9..ffc1672d7dc 100755
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -231,7 +231,7 @@ test_expect_success 'traverse unexpected non-tag tag (tree seen to blob)' '
'
-test_expect_failure 'traverse unexpected objects with for-each-ref' '
+test_expect_success 'traverse unexpected objects with for-each-ref' '
cat >expect <<-EOF &&
error: bad tag pointer to $tree in $tag_tag_tree
fatal: parse_object_buffer failed on $tag_tag_tree for refs/tags/tag_tag_tree
@@ -241,7 +241,7 @@ test_expect_failure 'traverse unexpected objects with for-each-ref' '
'
>fsck-object-isa
-test_expect_failure 'setup: unexpected objects with fsck' '
+test_expect_success 'setup: unexpected objects with fsck' '
test_must_fail git fsck 2>err &&
sed -n -e "/^error: object .* is a .*, not a .*$/ {
s/^error: object \([0-9a-f]*\) is a \([a-z]*\), not a [a-z]*$/\\1 \\2/;
@@ -251,7 +251,7 @@ test_expect_failure 'setup: unexpected objects with fsck' '
while read oid type
do
- test_expect_failure "fsck knows unexpected object $oid is $type" '
+ test_expect_success "fsck knows unexpected object $oid is $type" '
git cat-file -t $oid >expect &&
echo $type >actual &&
test_cmp expect actual
diff --git a/tag.c b/tag.c
index 19453c2edbf..ad92cf89209 100644
--- a/tag.c
+++ b/tag.c
@@ -193,8 +193,9 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
}
if (!item->tagged || strcmp(type_name(item->tagged->type), type)) {
- error(_("object %s is a %s, not a %s"), oid_to_hex(&oid),
- type_name(item->tagged->type), type);
+ if (item->tagged && item->tagged->parsed)
+ error(_("object %s is a %s, not a %s"), oid_to_hex(&oid),
+ type_name(item->tagged->type), type);
return error("bad tag pointer to %s in %s",
oid_to_hex(&oid),
oid_to_hex(&item->object.oid));
--
2.38.0.1511.gcdcff1f1dc2
