From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jun 2025 20:57:45 +0000 (-0700)
Subject: Merge branch 'sa/multi-mailmap-fix' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c49280440606504d4bf4d4c8747765d59f3e19c2;p=thirdparty%2Fgit.git

Merge branch 'sa/multi-mailmap-fix' into next

When asking to apply mailmap to both author and committer field
while showing a commit object, the field that appears later was not
correctly parsed and replaced, which has been corrected.

* sa/multi-mailmap-fix:
  cat-file: fix mailmap application for different author and committer
---

c49280440606504d4bf4d4c8747765d59f3e19c2