pull: pass --allow-unrelated-histories to "git merge"

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 6bff970c905b6a9c8a04773d64afb164dd124cbe..c30bcd06cbd516eb04e9b55b27b5f091ede61439 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -148,8 +148,7 @@ static uint32_t find_object_pos(const unsigned char *sha1)
        return entry->in_pack_pos;
 }
 
-static void show_object(struct object *object, const struct name_path *path,
-                       const char *last, void *data)
+static void show_object(struct object *object, const char *name, void *data)
 {
        struct bitmap *base = data;
        bitmap_set(base, find_object_pos(object->oid.hash));