On Sun, Jan 03 2021, brian m. carlson wrote: > -void clear_mailmap(struct string_list *map) > +void clear_mailmap(struct mailmap *mailmap) > { > + struct string_list *map = mailmap->mailmap; > debug_mm("mailmap: clearing %d entries...\n", map->nr); Re my comment on 1/5 wouldn't it make more sense to use the new API here: - debug_mm("mailmap: clearing %d entries...\n", map->nr); + debug_mm("mailmap: clearing %u entries...\n", mailmap_entries(mailmap)); I changed %d to %u here, maybe we'd also want to do that earlier while we're at it (not code you're changing): - debug_mm("mailmap: removing entries for <%s>, with %d sub-entries\n", + debug_mm("mailmap: removing entries for <%s>, with %u sub-entries\n",