Merge with master to pick up gitk updates.

diff --git a/rev-list.c b/rev-list.c
index ce5b8b2ad528830eb0c6572edcdc55d97422952c..2ed5e87e1245bcb15f4eabf1b5efc2692601436f 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -418,6 +418,8 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
                if (tag_objects && !(object->flags & UNINTERESTING))
                        add_pending_object(object, tag->tag);
                object = parse_object(tag->tagged->sha1);
+               if (!object)
+                       die("bad object %s", sha1_to_hex(tag->tagged->sha1));
        }
 
        /*