{"thread":{"id":"59562","subject":"[PATCH] mailmap: change primary address for Emily Shaffer","startedAt":"2023-04-07T21:23:08Z","lastAt":"2023-04-07T21:58:51Z","messageCount":3,"participants":["emilyshaffer@google.com","Junio C Hamano","Emily Shaffer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"475020","messageId":"20230407212249.1541509-1-nasamuffin@google.com","threadId":"59562","inReplyTo":null,"subject":"[PATCH] mailmap: change primary address for Emily Shaffer","fromName":"","fromEmail":"emilyshaffer@google.com","sentAt":"2023-04-07T21:22:49Z","receivedAt":"2023-04-07T21:23:08Z","isPatch":true,"sender":{"key":"nasamuffin@google.com","avatar":"https://avatars.githubusercontent.com/u/1606826?v=4"},"body":"Emily finally figured out how to set up their alias at DayJob, and would\nprefer to use nasamuffin@google.com, partially to reduce confusion\nbetween IRC and list, and partially because they just like the alias a\nlot more.\n\nSigned-off-by: Emily Shaffer \n---\n .mailmap | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/.mailmap b/.mailmap\nindex 95aaa1c833..733e047aa8 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -65,6 +65,7 @@ Derrick Stolee \n Deskin Miller \n Đoàn Trần Công Danh Doan Tran Cong Danh\n Dirk Süsserott \n+Emily Shaffer \n Eric Blake \n Eric Hanchrow \n Eric S. Raymond \n-- \n2.40.0.577.gac1e443424-goog\n\n"},{"id":"475021","messageId":"xmqq5ya7jrzm.fsf@gitster.g","threadId":"59562","inReplyTo":"20230407212249.1541509-1-nasamuffin@google.com","subject":"Re: [PATCH] mailmap: change primary address for Emily Shaffer","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-04-07T21:35:09Z","receivedAt":"2023-04-07T21:35:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"emilyshaffer@google.com writes:\n\n> From: emilyshaffer@google.com\n> Subject: [PATCH] mailmap: change primary address for Emily Shaffer\n>\n> Emily finally figured out how to set up their alias at DayJob, and would\n> prefer to use nasamuffin@google.com, partially to reduce confusion\n> between IRC and list, and partially because they just like the alias a\n> lot more.\n>\n> Signed-off-by: Emily Shaffer \n> ---\n> .mailmap | 1 +\n> 1 file changed, 1 insertion(+)\n\nCute. By telling the machinery to map \"\"\n(with any name) to \"Emily Shaffer \", and\nusing a nameless as the sender for the\nmail to add such a mailmap entry, the result of applying such a\npatch, even though the underlying commit object created lacks the\nhuman-readable name, like so:\n\n $ git cat-file commit HEAD\n tree cec72ed0d4fb9faa44cd8d23008f90da3239808b\n parent 0607f793cbe0af16aee6d2480056d891835884bd\n author emilyshaffer@google.com 1680902569 -0700\n committer Junio C Hamano 1680902794 -0700\n\n mailmap: change primary address for Emily Shaffer\n ...\n\nwould show with a substituted author:\n\n $ git show HEAD\n commit 2485a52e4b4419020286e98dd04c0e5ebb218f06\n Author: Emily Shaffer \n Date: Fri Apr 7 14:22:49 2023 -0700\n\n mailmap: change primary address for Emily Shaffer\n ... \n\nI'll amend the commit to record the nasammuffin name instead,\nthough.\n\n\n"},{"id":"475022","messageId":"CAJoAoZnHPUvZONv8kgb_c2HvsEXHMnLCZShOOjE+uE0ainieVA@mail.gmail.com","threadId":"59562","inReplyTo":"xmqq5ya7jrzm.fsf@gitster.g","subject":"Re: [PATCH] mailmap: change primary address for Emily Shaffer","fromName":"Emily Shaffer","fromEmail":"nasamuffin@google.com","sentAt":"2023-04-07T21:58:31Z","receivedAt":"2023-04-07T21:58:51Z","isPatch":true,"sender":{"key":"nasamuffin@google.com","avatar":"https://avatars.githubusercontent.com/u/1606826?v=4"},"body":"On Fri, Apr 7, 2023 at 2:35 PM Junio C Hamano wrote:\n>\n> emilyshaffer@google.com writes:\n>\n> > From: emilyshaffer@google.com\n> > Subject: [PATCH] mailmap: change primary address for Emily Shaffer\n> >\n> > Emily finally figured out how to set up their alias at DayJob, and would\n> > prefer to use nasamuffin@google.com, partially to reduce confusion\n> > between IRC and list, and partially because they just like the alias a\n> > lot more.\n> >\n> > Signed-off-by: Emily Shaffer \n> > ---\n> > .mailmap | 1 +\n> > 1 file changed, 1 insertion(+)\n>\n> Cute. By telling the machinery to map \"\"\n> (with any name) to \"Emily Shaffer \", and\n> using a nameless as the sender for the\n> mail to add such a mailmap entry, the result of applying such a\n> patch, even though the underlying commit object created lacks the\n> human-readable name, like so:\n>\n> $ git cat-file commit HEAD\n> tree cec72ed0d4fb9faa44cd8d23008f90da3239808b\n> parent 0607f793cbe0af16aee6d2480056d891835884bd\n> author emilyshaffer@google.com 1680902569 -0700\n> committer Junio C Hamano 1680902794 -0700\n>\n> mailmap: change primary address for Emily Shaffer\n> ...\n>\n> would show with a substituted author:\n>\n> $ git show HEAD\n> commit 2485a52e4b4419020286e98dd04c0e5ebb218f06\n> Author: Emily Shaffer \n> Date: Fri Apr 7 14:22:49 2023 -0700\n>\n> mailmap: change primary address for Emily Shaffer\n> ...\n\nOh, yuck. I guess I'm sending nameless From: line because of\npoorly-configured git-send-email settings. I'll look into it.\n\n>\n> I'll amend the commit to record the nasammuffin name instead,\n> though.\n\nThanks muchly.\n\n - Emily\n"}]}