refs: switch peel_ref() to peel_iterated_oid()

[thirdparty/git.git] / builtin / pack-objects.c

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 5617c01b5aae0dafd33467cecabe8b58fd36d568..bd18139d7e2d4d21cacb2d82fac5beaee71a48b0 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -629,7 +629,7 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag,
 
        if (entry)
                entry->tagged = 1;
-       if (!peel_ref(path, &peeled)) {
+       if (!peel_iterated_oid(oid, &peeled)) {
                entry = packlist_find(&to_pack, &peeled);
                if (entry)
                        entry->tagged = 1;
@@ -1104,7 +1104,6 @@ static void write_pack_file(void)
                                stop_progress(&progress_state);
 
                                bitmap_writer_show_progress(progress);
-                               bitmap_writer_reuse_bitmaps(&to_pack);
                                bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
                                bitmap_writer_build(&to_pack);
                                bitmap_writer_finish(written_list, nr_written,
@@ -2809,7 +2808,7 @@ static int add_ref_tag(const char *path, const struct object_id *oid, int flag,
        struct object_id peeled;
 
        if (starts_with(path, "refs/tags/") && /* is a tag? */
-           !peel_ref(path, &peeled)    && /* peelable? */
+           !peel_iterated_oid(oid, &peeled)    && /* peelable? */
            obj_is_packed(&peeled)) /* object packed? */
                add_tag_chain(oid);
        return 0;