Merge branch 'rd/doc-remote-tracking-with-hyphen'

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 3f2dab340f6cc05cde659f97dacbd825d8266bc9..06771113fb311e4a75fa7a1e325221e4b60c850c 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -255,7 +255,7 @@ static char *pack_bitmap_filename(struct packed_git *p)
        size_t len;
 
        if (!strip_suffix(p->pack_name, ".pack", &len))
-               die("BUG: pack_name does not end in .pack");
+               BUG("pack_name does not end in .pack");
        return xstrfmt("%.*s.bitmap", (int)len, p->pack_name);
 }
 
@@ -723,13 +723,13 @@ int prepare_bitmap_walk(struct rev_info *revs)
                revs->ignore_missing_links = 0;
 
                if (haves_bitmap == NULL)
-                       die("BUG: failed to perform bitmap walk");
+                       BUG("failed to perform bitmap walk");
        }
 
        wants_bitmap = find_objects(revs, wants, haves_bitmap);
 
        if (!wants_bitmap)
-               die("BUG: failed to perform bitmap walk");
+               BUG("failed to perform bitmap walk");
 
        if (haves_bitmap)
                bitmap_and_not(wants_bitmap, haves_bitmap);
@@ -1033,7 +1033,7 @@ int rebuild_existing_bitmaps(struct packing_data *mapping,
                oe = packlist_find(mapping, sha1, NULL);
 
                if (oe)
-                       reposition[i] = oe->in_pack_pos + 1;
+                       reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
        }
 
        rebuild = bitmap_new();