git-apply: parse the diff headers (both traditional and new)

[git.git] / tag.c

diff --git a/tag.c b/tag.c
index 22deb243ad58b2c57fb8652fe2d08c571ee3e781..26494ca9695fdd2e81952378f64bbc361698117d 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -13,6 +13,8 @@ struct tag *lookup_tag(unsigned char *sha1)
                 ret->object.type = tag_type;
                 return ret;
         }
+       if (!obj->type)
+               obj->type = tag_type;
         if (obj->type != tag_type) {
                 error("Object %s is a %s, not a tree", 
                       sha1_to_hex(sha1), obj->type);