Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 84cd1bed4a1f16efe18698ac92c6614cb91bf209..e07c798879b7277797b093a3eac6b4aece9ee4d2 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -709,9 +709,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
                        else
                                object_list_insert(object, &wants);
 
-                       if (!tag->tagged)
-                               die("bad tag");
-                       object = parse_object_or_die(&tag->tagged->oid, NULL);
+                       object = parse_object_or_die(get_tagged_oid(tag), NULL);
                }
 
                if (object->flags & UNINTERESTING)