* git log displaying wrong account information
@ 2021-10-23 5:58 Schanzenbach, Martin
2021-10-23 6:16 ` Đoàn Trần Công Danh
0 siblings, 1 reply; 3+ messages in thread
From: Schanzenbach, Martin @ 2021-10-23 5:58 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1507 bytes --]
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.
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.
Any idea what to do? 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
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git log displaying wrong account information
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
2021-10-23 6:21 ` Schanzenbach, Martin
0 siblings, 1 reply; 3+ messages in thread
From: Đoàn Trần Công Danh @ 2021-10-23 6:16 UTC (permalink / raw)
To: Schanzenbach, Martin; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git log displaying wrong account information
2021-10-23 6:16 ` Đoàn Trần Công Danh
@ 2021-10-23 6:21 ` Schanzenbach, Martin
0 siblings, 0 replies; 3+ messages in thread
From: Schanzenbach, Martin @ 2021-10-23 6:21 UTC (permalink / raw)
To: Đoàn Trần Công Danh; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 3025 bytes --]
Thanks! I did not know about that file.
> On 23. Oct 2021, at 08:16, Đoàn Trần Công Danh <congdanhqx@gmail.com> wrote:
>
> 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
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-23 6:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2021-10-23 6:21 ` Schanzenbach, Martin
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).