completion: use __gitcomp_builtin in _git_merge

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index e313f4f2bc69f967ec4354e80cd62b329c7bcb21..a8df5ce2ab67bfdb5445e4c02e4ad65032abe9a0 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -73,7 +73,8 @@ void bitmap_writer_build_type_index(struct pack_idx_entry **index,
                        break;
 
                default:
-                       real_type = sha1_object_info(entry->idx.sha1, NULL);
+                       real_type = sha1_object_info(entry->idx.oid.hash,
+                                                    NULL);
                        break;
                }
 
@@ -96,7 +97,8 @@ void bitmap_writer_build_type_index(struct pack_idx_entry **index,
 
                default:
                        die("Missing type information for %s (%d/%d)",
-                           sha1_to_hex(entry->idx.sha1), real_type, entry->type);
+                           oid_to_hex(&entry->idx.oid), real_type,
+                           entry->type);
                }
        }
 }
@@ -295,9 +297,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
 
                        traverse_commit_list(&revs, show_commit, show_object, base);
 
-                       revs.pending.nr = 0;
-                       revs.pending.alloc = 0;
-                       revs.pending.objects = NULL;
+                       object_array_clear(&revs.pending);
 
                        stored->bitmap = bitmap_to_ewah(base);
                        need_reset = 0;
@@ -459,7 +459,7 @@ static inline void dump_bitmap(struct sha1file *f, struct ewah_bitmap *bitmap)
 static const unsigned char *sha1_access(size_t pos, void *table)
 {
        struct pack_idx_entry **index = table;
-       return index[pos]->sha1;
+       return index[pos]->oid.hash;
 }
 
 static void write_selected_commits_v1(struct sha1file *f,