{"thread":{"id":"33376","subject":"[PATCH] update pasky's email address","startedAt":"2013-04-04T01:50:42Z","lastAt":"2013-04-04T10:32:58Z","messageCount":4,"participants":["Eric Wong","Junio C Hamano","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"213082","messageId":"20130404015042.GA19593@dcvr.yhbt.net","threadId":"33376","inReplyTo":null,"subject":"[PATCH] update pasky's email address","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2013-04-04T01:50:42Z","receivedAt":"2013-04-04T01:50:42Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Mail to pasky@suse.cz is bouncing.\n\nSigned-off-by: Eric Wong \n---\n I noticed this when I attempted to reply to Thomas's email:\n http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@inf.ethz.ch\n\n .mailmap | 1 +\n Documentation/howto/rebase-from-internal-branch.txt | 4 ++--\n gitweb/static/js/blame_incremental.js | 2 +-\n gitweb/static/js/javascript-detection.js | 2 +-\n gitweb/static/js/lib/common-lib.js | 2 +-\n gitweb/static/js/lib/datetime.js | 2 +-\n perl/Git.pm | 2 +-\n 7 files changed, 8 insertions(+), 7 deletions(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex c7e8618..1f01263 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -73,6 +73,7 @@ Nguyễn Thái Ngọc Duy \n \n Peter Krefting \n Peter Krefting \n+Petr Baudis \n Philippe Bruhat \n Ralf Thielow \n Ramsay Allan Jones \ndiff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt\nindex 19ab604..914d011 100644\n--- a/Documentation/howto/rebase-from-internal-branch.txt\n+++ b/Documentation/howto/rebase-from-internal-branch.txt\n@@ -1,6 +1,6 @@\n From:\tJunio C Hamano \n To:\tgit@vger.kernel.org\n-Cc:\tPetr Baudis , Linus Torvalds \n+Cc:\tPetr Baudis , Linus Torvalds \n Subject: Re: sending changesets from the middle of a git tree\n Date:\tSun, 14 Aug 2005 18:37:39 -0700\n Abstract: In this article, JC talks about how he rebases the\n@@ -14,7 +14,7 @@ How to rebase from an internal branch\n =====================================\n \n --------------------------------------\n-Petr Baudis writes:\n+Petr Baudis writes:\n \n > Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter\n > where Junio C Hamano told me that...\ndiff --git a/gitweb/static/js/blame_incremental.js b/gitweb/static/js/blame_incremental.js\nindex db6eb50..e162ec9 100644\n--- a/gitweb/static/js/blame_incremental.js\n+++ b/gitweb/static/js/blame_incremental.js\n@@ -1,5 +1,5 @@\n // Copyright (C) 2007, Fredrik Kuivinen \n-// 2007, Petr Baudis \n+// 2007, Petr Baudis \n // 2008-2011, Jakub Narebski \n \n /**\ndiff --git a/gitweb/static/js/javascript-detection.js b/gitweb/static/js/javascript-detection.js\nindex fa2596f..3da2d2e 100644\n--- a/gitweb/static/js/javascript-detection.js\n+++ b/gitweb/static/js/javascript-detection.js\n@@ -1,5 +1,5 @@\n // Copyright (C) 2007, Fredrik Kuivinen \n-// 2007, Petr Baudis \n+// 2007, Petr Baudis \n // 2008-2011, Jakub Narebski \n \n /**\ndiff --git a/gitweb/static/js/lib/common-lib.js b/gitweb/static/js/lib/common-lib.js\nindex 018bbb7..9c3c465 100644\n--- a/gitweb/static/js/lib/common-lib.js\n+++ b/gitweb/static/js/lib/common-lib.js\n@@ -1,5 +1,5 @@\n // Copyright (C) 2007, Fredrik Kuivinen \n-// 2007, Petr Baudis \n+// 2007, Petr Baudis \n // 2008-2011, Jakub Narebski \n \n /**\ndiff --git a/gitweb/static/js/lib/datetime.js b/gitweb/static/js/lib/datetime.js\nindex f78c60a..fdd46d3 100644\n--- a/gitweb/static/js/lib/datetime.js\n+++ b/gitweb/static/js/lib/datetime.js\n@@ -1,5 +1,5 @@\n // Copyright (C) 2007, Fredrik Kuivinen \n-// 2007, Petr Baudis \n+// 2007, Petr Baudis \n // 2008-2011, Jakub Narebski \n \n /**\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex 96cac39..7802afc 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -1434,7 +1434,7 @@ sub git_cmd_try(&$) {\n \n =head1 COPYRIGHT\n \n-Copyright 2006 by Petr Baudis Epasky@suse.czE.\n+Copyright 2006 by Petr Baudis Epasky@ucw.czE.\n \n This module is free software; it may be used, copied, modified\n and distributed under the terms of the GNU General Public Licence,\n-- \nEric Wong\n"},{"id":"213087","messageId":"7v38v6lrrk.fsf@alter.siamese.dyndns.org","threadId":"33376","inReplyTo":"20130404015042.GA19593@dcvr.yhbt.net","subject":"Re: [PATCH] update pasky's email address","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-04T06:43:59Z","receivedAt":"2013-04-04T06:43:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong writes:\n\n> Mail to pasky@suse.cz is bouncing.\n>\n> Signed-off-by: Eric Wong \n> ---\n> I noticed this when I attempted to reply to Thomas's email:\n> http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@inf.ethz.ch\n>\n> .mailmap | 1 +\n\nThanks, but I wonder if an entry update to .mailmap alone is\nsufficient.\n\nEspecially, a change like this:\n\n> index db6eb50..e162ec9 100644\n> --- a/gitweb/static/js/blame_incremental.js\n> +++ b/gitweb/static/js/blame_incremental.js\n> @@ -1,5 +1,5 @@\n> // Copyright (C) 2007, Fredrik Kuivinen \n> -// 2007, Petr Baudis \n> +// 2007, Petr Baudis \n\nmakes me feel very uneasy and feels outright wrong; unless the\nchange by Petr in year 2007 was associated with the ucw.cz address,\nnot his then-current employer, that is.\n"},{"id":"213089","messageId":"20130404072123.GA6805@dcvr.yhbt.net","threadId":"33376","inReplyTo":"7v38v6lrrk.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] update pasky's email address","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2013-04-04T07:21:23Z","receivedAt":"2013-04-04T07:21:23Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Junio C Hamano wrote:\n> Eric Wong writes:\n> \n> > Mail to pasky@suse.cz is bouncing.\n> >\n> > Signed-off-by: Eric Wong \n> > ---\n> > I noticed this when I attempted to reply to Thomas's email:\n> > http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@inf.ethz.ch\n> >\n> > .mailmap | 1 +\n> \n> Thanks, but I wonder if an entry update to .mailmap alone is\n> sufficient.\n\nGah, and somehow I got \"suse.de\" burned into my brain and screwed up\nthe .mailmap entry (should have been \"suse.cz\") :x\n\n> Especially, a change like this:\n> \n> > index db6eb50..e162ec9 100644\n> > --- a/gitweb/static/js/blame_incremental.js\n> > +++ b/gitweb/static/js/blame_incremental.js\n> > @@ -1,5 +1,5 @@\n> > // Copyright (C) 2007, Fredrik Kuivinen \n> > -// 2007, Petr Baudis \n> > +// 2007, Petr Baudis \n> \n> makes me feel very uneasy and feels outright wrong; unless the\n> change by Petr in year 2007 was associated with the ucw.cz address,\n> not his then-current employer, that is.\n\nI understand your concern. Perhaps keeping the old address with\na pointer to the current address?\n\n 2007, Petr Baudis (currently pasky@ucw.cz)\n\nI'll wait for Petr's thoughts.\n"},{"id":"213094","messageId":"20130404103258.GI6137@machine.or.cz","threadId":"33376","inReplyTo":"20130404072123.GA6805@dcvr.yhbt.net","subject":"Re: [PATCH] update pasky's email address","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2013-04-04T10:32:58Z","receivedAt":"2013-04-04T10:32:58Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":" Hi!\n\nOn Thu, Apr 04, 2013 at 01:50:42AM +0000, Eric Wong wrote:\n> Mail to pasky@suse.cz is bouncing.\n\n Oh, I totally forgot to take care of this. Thanks a lot for fixing it!\n\n> Signed-off-by: Eric Wong \n\n In general, Acked-by: Petr Baudis \n\nOn Thu, Apr 04, 2013 at 07:21:23AM +0000, Eric Wong wrote:\n> Junio C Hamano wrote:\n> > Especially, a change like this:\n> > \n> > > index db6eb50..e162ec9 100644\n> > > --- a/gitweb/static/js/blame_incremental.js\n> > > +++ b/gitweb/static/js/blame_incremental.js\n> > > @@ -1,5 +1,5 @@\n> > > // Copyright (C) 2007, Fredrik Kuivinen \n> > > -// 2007, Petr Baudis \n> > > +// 2007, Petr Baudis \n> > \n> > makes me feel very uneasy and feels outright wrong; unless the\n> > change by Petr in year 2007 was associated with the ucw.cz address,\n> > not his then-current employer, that is.\n> \n> I understand your concern. Perhaps keeping the old address with\n> a pointer to the current address?\n> \n> 2007, Petr Baudis (currently pasky@ucw.cz)\n> \n> I'll wait for Petr's thoughts.\n\n Frankly, I have no idea how to handle this well; is this the first\ntime such a change has to happen in Git? Your proposed form seems\nformally correct but feels a bit cumbersome to me. :-)\n\n I think that if SUSE would like the email address to stay in the\noriginal form, the best way to confirm their preference would be to keep\nit actually functional. Maybe Vojtech will have some thoughts on\nwhether that would be possibe or whether we should keep the address\ninact.\n\n Kind regards,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\n\tFor every complex problem there is an answer that is clear,\n\tsimple, and wrong. -- H. L. Mencken\n"}]}