Use fink/darwinport paths for OSX

diff --git a/tag.c b/tag.c
index 22deb243ad58b2c57fb8652fe2d08c571ee3e781..e574c4b7a496d3a1d113801214197a04d5c74d42 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,7 +3,19 @@
 
 const char *tag_type = "tag";
 
-struct tag *lookup_tag(unsigned char *sha1)
+struct object *deref_tag(struct object *o, const char *warn, int warnlen)
+{
+       while (o && o->type == tag_type)
+               o = parse_object(((struct tag *)o)->tagged->sha1);
+       if (!o && warn) {
+               if (!warnlen)
+                       warnlen = strlen(warn);
+               error("missing object referenced by '%.*s'", warnlen, warn);
+       }
+       return o;
+}
+
+struct tag *lookup_tag(const unsigned char *sha1)
 {
         struct object *obj = lookup_object(sha1);
         if (!obj) {
@@ -13,6 +25,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);
@@ -26,6 +40,7 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
        int typelen, taglen;
        unsigned char object[20];
        const char *type_line, *tag_line, *sig_line;
+       char type[20];
 
         if (item->object.parsed)
                 return 0;
@@ -36,10 +51,6 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
        if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object))
                return -1;
 
-       item->tagged = parse_object(object);
-       if (item->tagged)
-               add_ref(&item->object, item->tagged);
-
        type_line = data + 48;
        if (memcmp("\ntype ", type_line-1, 6))
                return -1;
@@ -56,11 +67,17 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
        typelen = tag_line - type_line - strlen("type \n");
        if (typelen >= 20)
                return -1;
+       memcpy(type, type_line + 5, typelen);
+       type[typelen] = '\0';
        taglen = sig_line - tag_line - strlen("tag \n");
        item->tag = xmalloc(taglen + 1);
        memcpy(item->tag, tag_line + 4, taglen);
        item->tag[taglen] = '\0';
 
+       item->tagged = lookup_object_type(object, type);
+       if (item->tagged)
+               add_ref(&item->object, item->tagged);
+
        return 0;
 }