public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: Siddharth Asthana <siddharthasthana31@gmail.com>,
	 git <git@vger.kernel.org>,
	 viakliushin@gitlab.com,  John Cai <johncai86@gmail.com>
Subject: Re: [PATCH v2] cat-file: fix mailmap application for different author and committer
Date: Fri, 13 Jun 2025 08:56:59 -0700	[thread overview]
Message-ID: <xmqqh60jab3o.fsf@gitster.g> (raw)
In-Reply-To: <CAP8UFD37rFvhO_XLhSjZNoOQ_ePwrrALYBcqKHfhMKcpqhkP8Q@mail.gmail.com> (Christian Couder's message of "Fri, 13 Jun 2025 14:59:52 +0200")

Christian Couder <christian.couder@gmail.com> writes:

> On Fri, Jun 13, 2025 at 1:58 PM <siddharthasthana31@gmail.com> wrote:
>
> [...]
>
>> This bug was introduced in e9c1b0e3 (revision: improve
>> commit_rewrite_person(), 2022-07-19) when the much simpler version of
>> commit_rewrite_person() that worked on one "person header" at a time
>> was rewritten to use the current apply_mailmap_to_header() function.
>> The original implementation processed author and committer separately,
>> but the rewrite introduced this loop-based approach that failed to
>> properly handle the transition between identity lines.
>
> Thanks for adding this context and improving the `sed` invocation in
> the tests! Happy to stand behind this change too :-)

Thanks, all.  Queued.  Let's mark it for 'next', hoping that the fix
will be in the first batch in the post 2.50 cycle.


      reply	other threads:[~2025-06-13 15:57 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-11  6:26 [PATCH] cat-file: fix mailmap application for different author and committer siddharthasthana31
2025-06-11  9:38 ` Christian Couder
2025-06-12 23:49   ` Junio C Hamano
2025-06-11 15:53 ` Junio C Hamano
2025-06-11 19:05   ` Eric Sunshine
2025-06-11 23:35     ` Junio C Hamano
2025-06-13  9:20   ` Siddharth Asthana
2025-06-13 11:57 ` [PATCH v2] " siddharthasthana31
2025-06-13 12:59   ` Christian Couder
2025-06-13 15:56     ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqh60jab3o.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johncai86@gmail.com \
    --cc=siddharthasthana31@gmail.com \
    --cc=viakliushin@gitlab.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox