Sync with 2.16.5

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 8bcd1c8665d02840d7d77bc677b293595f9e0a31..9d87eac07ba1d9bf01bfe4a24c8ba784e71dbac4 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -203,7 +203,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
                return error("cannot find the current offset");
 
        header_len = xsnprintf((char *)obuf, sizeof(obuf), "%s %" PRIuMAX,
-                              typename(type), (uintmax_t)size) + 1;
+                              type_name(type), (uintmax_t)size) + 1;
        the_hash_algo->init_fn(&ctx);
        the_hash_algo->update_fn(&ctx, obuf, header_len);