* [PATCH] mailmap: change primary address for Emily Shaffer
@ 2023-04-07 21:22 emilyshaffer
2023-04-07 21:35 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: emilyshaffer @ 2023-04-07 21:22 UTC (permalink / raw)
To: git; +Cc: Emily Shaffer
Emily finally figured out how to set up their alias at DayJob, and would
prefer to use nasamuffin@google.com, partially to reduce confusion
between IRC and list, and partially because they just like the alias a
lot more.
Signed-off-by: Emily Shaffer <nasamuffin@google.com>
---
.mailmap | 1 +
1 file changed, 1 insertion(+)
diff --git a/.mailmap b/.mailmap
index 95aaa1c833..733e047aa8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,6 +65,7 @@ Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
Deskin Miller <deskinm@umich.edu>
Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
Dirk Süsserott <newsletter@dirk.my1.cc>
+Emily Shaffer <nasamuffin@google.com> <emilyshaffer@google.com>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>
Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
Eric S. Raymond <esr@thyrsus.com>
--
2.40.0.577.gac1e443424-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mailmap: change primary address for Emily Shaffer
2023-04-07 21:22 [PATCH] mailmap: change primary address for Emily Shaffer emilyshaffer
@ 2023-04-07 21:35 ` Junio C Hamano
2023-04-07 21:58 ` Emily Shaffer
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2023-04-07 21:35 UTC (permalink / raw)
To: emilyshaffer; +Cc: git, Emily Shaffer
emilyshaffer@google.com writes:
> From: emilyshaffer@google.com
> Subject: [PATCH] mailmap: change primary address for Emily Shaffer
>
> Emily finally figured out how to set up their alias at DayJob, and would
> prefer to use nasamuffin@google.com, partially to reduce confusion
> between IRC and list, and partially because they just like the alias a
> lot more.
>
> Signed-off-by: Emily Shaffer <nasamuffin@google.com>
> ---
> .mailmap | 1 +
> 1 file changed, 1 insertion(+)
Cute. By telling the machinery to map "<emilyshaffer@google.com>"
(with any name) to "Emily Shaffer <nasamuffin@google.com>", and
using a nameless <emilyshaffer@google.com> as the sender for the
mail to add such a mailmap entry, the result of applying such a
patch, even though the underlying commit object created lacks the
human-readable name, like so:
$ git cat-file commit HEAD
tree cec72ed0d4fb9faa44cd8d23008f90da3239808b
parent 0607f793cbe0af16aee6d2480056d891835884bd
author emilyshaffer@google.com <emilyshaffer@google.com> 1680902569 -0700
committer Junio C Hamano <gitster@pobox.com> 1680902794 -0700
mailmap: change primary address for Emily Shaffer
...
would show with a substituted author:
$ git show HEAD
commit 2485a52e4b4419020286e98dd04c0e5ebb218f06
Author: Emily Shaffer <nasamuffin@google.com>
Date: Fri Apr 7 14:22:49 2023 -0700
mailmap: change primary address for Emily Shaffer
...
I'll amend the commit to record the nasammuffin name instead,
though.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mailmap: change primary address for Emily Shaffer
2023-04-07 21:35 ` Junio C Hamano
@ 2023-04-07 21:58 ` Emily Shaffer
0 siblings, 0 replies; 3+ messages in thread
From: Emily Shaffer @ 2023-04-07 21:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Fri, Apr 7, 2023 at 2:35 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> emilyshaffer@google.com writes:
>
> > From: emilyshaffer@google.com
> > Subject: [PATCH] mailmap: change primary address for Emily Shaffer
> >
> > Emily finally figured out how to set up their alias at DayJob, and would
> > prefer to use nasamuffin@google.com, partially to reduce confusion
> > between IRC and list, and partially because they just like the alias a
> > lot more.
> >
> > Signed-off-by: Emily Shaffer <nasamuffin@google.com>
> > ---
> > .mailmap | 1 +
> > 1 file changed, 1 insertion(+)
>
> Cute. By telling the machinery to map "<emilyshaffer@google.com>"
> (with any name) to "Emily Shaffer <nasamuffin@google.com>", and
> using a nameless <emilyshaffer@google.com> as the sender for the
> mail to add such a mailmap entry, the result of applying such a
> patch, even though the underlying commit object created lacks the
> human-readable name, like so:
>
> $ git cat-file commit HEAD
> tree cec72ed0d4fb9faa44cd8d23008f90da3239808b
> parent 0607f793cbe0af16aee6d2480056d891835884bd
> author emilyshaffer@google.com <emilyshaffer@google.com> 1680902569 -0700
> committer Junio C Hamano <gitster@pobox.com> 1680902794 -0700
>
> mailmap: change primary address for Emily Shaffer
> ...
>
> would show with a substituted author:
>
> $ git show HEAD
> commit 2485a52e4b4419020286e98dd04c0e5ebb218f06
> Author: Emily Shaffer <nasamuffin@google.com>
> Date: Fri Apr 7 14:22:49 2023 -0700
>
> mailmap: change primary address for Emily Shaffer
> ...
Oh, yuck. I guess I'm sending nameless From: line because of
poorly-configured git-send-email settings. I'll look into it.
>
> I'll amend the commit to record the nasammuffin name instead,
> though.
Thanks muchly.
- Emily
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-07 21:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-07 21:22 [PATCH] mailmap: change primary address for Emily Shaffer emilyshaffer
2023-04-07 21:35 ` Junio C Hamano
2023-04-07 21:58 ` Emily Shaffer
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).