From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: "Schanzenbach, Martin" <mschanzenbach@posteo.de>
Cc: git@vger.kernel.org
Subject: Re: git log displaying wrong account information
Date: Sat, 23 Oct 2021 13:16:06 +0700 [thread overview]
Message-ID: <YXOopkKXrluffiuX@danh.dev> (raw)
In-Reply-To: <9826C830-3680-4AC4-9ADB-5FA45222A15B@posteo.de>
On 2021-10-23 05:58:37+0000, "Schanzenbach, Martin" <mschanzenbach@posteo.de> wrote:
> Hello,
>
> there is some odd behaviour in "git log" which affects me in various ways:
> For some reason, it "canonicalizes" the author/commiter information in our repository: https://git.gnunet.org/git/gnunet.git
> 5 years ago or so I was using another email address for commits. I have been using a different email address since that.
>
> But if you clone this repo, and take a look at a recent commit such
> as be9b998b3369056c7c8fb0ae84fb4e2a064b496c using "git log", you
> will see that my email address is actually the old one and different
> from the _real_ information.
By old one, do you mean:
Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de>
It's because you have those entries in .mailmap:
---- 8< ----
Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <mschanzenbach@posteo.de>
Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Martin Schanzenbach <mschanzenbach@posteo.de>
---- >8 -----
Which will map your:
Martin Schanzenbach <mschanzenbach@posteo.de>
into it.
> You can see that I correctly set the author/commiter email here
> using either cgit
> (https://git.gnunet.org/gnunet.git/commit/?id=be9b998b3369056c7c8fb0ae84fb4e2a064b496c)
> or a specific format such as
>
> $ git log --pretty=format:"[%h] %cd - Committer: %cn (%ce), Author: %an (%ae)
>
> This is driving me crazy as the information is just plain wrong and
> when our CI tries to collect a blamelist when sending out
> notifications, it also uses the info from "git log" instead of the
> actual author/commiter emails, promptly sending the reports to the
> wrong account.
The original value is recorded in the commit. You can retrieve raw
value with git-cat-file
>
> Any idea what to do?
Change your mailmap entries to:
---- 8< ---
Martin Schanzenbach <mschanzenbach@posteo.de> Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Martin Schanzenbach <mschanzenbach@posteo.de> Schanzenbach, Martin <mschanzenbach@posteo.de>
Martin Schanzenbach <mschanzenbach@posteo.de> Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de>
---- >8 ----
> I really do not want to rebase and rewrite
> thousands of commits with questionable success.
> Doing that locally also does not change the output from "git log", in case you are wondering.
> This problem will reemerge eventually whenever an author wants to
> change to another email address it seems so is this a bug?
>
> Any help/pointers appreciated.
>
> Martin
--
Danh
next prev parent reply other threads:[~2021-10-23 6:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-23 5:58 git log displaying wrong account information Schanzenbach, Martin
2021-10-23 6:16 ` Đoàn Trần Công Danh [this message]
2021-10-23 6:21 ` Schanzenbach, Martin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YXOopkKXrluffiuX@danh.dev \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=mschanzenbach@posteo.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).