Merge branch 'dl/rebase-i-keep-base'

diff --git a/pack-bitmap.c b/pack-bitmap.c
index ed2befaac6535f25602fca57374d27d058277426..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)
@@ -1063,7 +1061,7 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
 
                entry = &bitmap_git->pack->revindex[i];
                nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
-               oe = packlist_find(mapping, &oid, NULL);
+               oe = packlist_find(mapping, &oid);
 
                if (oe)
                        reposition[i] = oe_in_pack_pos(mapping, oe) + 1;