X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tag.c;h=864ac1bb602b1af07301d0b5f15d31e904b343a6;hb=b8e9a00d40839a76928c54366a1c46ad54d7fd5d;hp=74d0dabe5d8c1f06a3f67475368c34e3b4046456;hpb=b879de1812f390e20f5ac7eb3aad9f83db02fae1;p=git.git diff --git a/tag.c b/tag.c index 74d0dabe5..864ac1bb6 100644 --- a/tag.c +++ b/tag.c @@ -5,7 +5,7 @@ const char *tag_type = "tag"; struct object *deref_tag(struct object *o, const char *warn, int warnlen) { - while (o && o->type == TYPE_TAG) + while (o && o->type == OBJ_TAG) o = parse_object(((struct tag *)o)->tagged->sha1); if (!o && warn) { if (!warnlen) @@ -21,12 +21,12 @@ struct tag *lookup_tag(const unsigned char *sha1) if (!obj) { struct tag *ret = alloc_tag_node(); created_object(sha1, &ret->object); - ret->object.type = TYPE_TAG; + ret->object.type = OBJ_TAG; return ret; } if (!obj->type) - obj->type = TYPE_TAG; - if (obj->type != TYPE_TAG) { + obj->type = OBJ_TAG; + if (obj->type != OBJ_TAG) { error("Object %s is a %s, not a tree", sha1_to_hex(sha1), typename(obj->type)); return NULL;