Merge branch 'dd/send-email-reedit'

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 3f2dab340f6cc05cde659f97dacbd825d8266bc9..c9e90d1bb530cae500fec403cf716c959c74cbcb 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -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();