revision.c: handle tag->tagged == NULL

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Koegler 2008-02-18 21:48:01 +01:00 committed by Junio C Hamano
parent f7de5a56b7
commit 9684afd967

View File

@ -177,6 +177,8 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object
struct tag *tag = (struct tag *) object; struct tag *tag = (struct tag *) object;
if (revs->tag_objects && !(flags & UNINTERESTING)) if (revs->tag_objects && !(flags & UNINTERESTING))
add_pending_object(revs, object, tag->tag); add_pending_object(revs, object, tag->tag);
if (!tag->tagged)
die("bad tag");
object = parse_object(tag->tagged->sha1); object = parse_object(tag->tagged->sha1);
if (!object) if (!object)
die("bad object %s", sha1_to_hex(tag->tagged->sha1)); die("bad object %s", sha1_to_hex(tag->tagged->sha1));
@ -689,6 +691,8 @@ static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
it = get_reference(revs, arg, sha1, 0); it = get_reference(revs, arg, sha1, 0);
if (it->type != OBJ_TAG) if (it->type != OBJ_TAG)
break; break;
if (!((struct tag*)it)->tagged)
return 0;
hashcpy(sha1, ((struct tag*)it)->tagged->sha1); hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
} }
if (it->type != OBJ_COMMIT) if (it->type != OBJ_COMMIT)