X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tag.c;h=f390ee703036bc74d6447d7e96c828310a948c2b;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=b1ab75ff0164b0090f43ba55d2a70239ca2fdb7a;hpb=638ccfdf0eeabf3d985426308b2a82db6207ae28;p=git.git

diff --git a/tag.c b/tag.c
index b1ab75ff..f390ee70 100644
--- a/tag.c
+++ b/tag.c
@@ -1,12 +1,17 @@
-#include "tag.h"
 #include "cache.h"
+#include "tag.h"
 
 const char *tag_type = "tag";
 
-struct object *deref_tag(struct object *o)
+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;
 }
 
@@ -14,8 +19,7 @@ struct tag *lookup_tag(const unsigned char *sha1)
 {
         struct object *obj = lookup_object(sha1);
         if (!obj) {
-                struct tag *ret = xmalloc(sizeof(struct tag));
-                memset(ret, 0, sizeof(struct tag));
+                struct tag *ret = xcalloc(1, sizeof(struct tag));
                 created_object(sha1, &ret->object);
                 ret->object.type = tag_type;
                 return ret;
@@ -70,8 +74,11 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
 	item->tag[taglen] = '\0';
 
 	item->tagged = lookup_object_type(object, type);
-	if (item->tagged)
-		add_ref(&item->object, item->tagged);
+	if (item->tagged && track_object_refs) {
+		struct object_refs *refs = alloc_object_refs(1);
+		refs->ref[0] = item->tagged;
+		set_object_refs(&item->object, refs);
+	}
 
 	return 0;
 }