[PATCH] update pasky's email address

[PATCH] update pasky's email address

[Eric Wong]

Mail to pasky@suse.cz is bouncing.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 I noticed this when I attempted to reply to Thomas's email:
 http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@inf.ethz.ch

 .mailmap                                            | 1 +
 Documentation/howto/rebase-from-internal-branch.txt | 4 ++--
 gitweb/static/js/blame_incremental.js               | 2 +-
 gitweb/static/js/javascript-detection.js            | 2 +-
 gitweb/static/js/lib/common-lib.js                  | 2 +-
 gitweb/static/js/lib/datetime.js                    | 2 +-
 perl/Git.pm                                         | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.mailmap b/.mailmap
index c7e8618..1f01263 100644
--- a/.mailmap
+++ b/.mailmap
@@ -73,6 +73,7 @@ Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 <nico@fluxnic.net> <nico@cam.org>
 Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
 Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
+Petr Baudis <pasky@ucw.cz> <pasky@suse.de>
 Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 19ab604..914d011 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -1,6 +1,6 @@
 From:	Junio C Hamano <gitster@pobox.com>
 To:	git@vger.kernel.org
-Cc:	Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org>
+Cc:	Petr Baudis <pasky@ucw.cz>, Linus Torvalds <torvalds@osdl.org>
 Subject: Re: sending changesets from the middle of a git tree
 Date:	Sun, 14 Aug 2005 18:37:39 -0700
 Abstract: In this article, JC talks about how he rebases the
@@ -14,7 +14,7 @@ How to rebase from an internal branch
 =====================================
 
 --------------------------------------
-Petr Baudis <pasky@suse.cz> writes:
+Petr Baudis <pasky@ucw.cz> writes:
 
 > Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
 > where Junio C Hamano <junkio@cox.net> told me that...
diff --git a/gitweb/static/js/blame_incremental.js b/gitweb/static/js/blame_incremental.js
index db6eb50..e162ec9 100644
--- a/gitweb/static/js/blame_incremental.js
+++ b/gitweb/static/js/blame_incremental.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2007, Fredrik Kuivinen <frekui@gmail.com>
-//               2007, Petr Baudis <pasky@suse.cz>
+//               2007, Petr Baudis <pasky@ucw.cz>
 //          2008-2011, Jakub Narebski <jnareb@gmail.com>
 
 /**
diff --git a/gitweb/static/js/javascript-detection.js b/gitweb/static/js/javascript-detection.js
index fa2596f..3da2d2e 100644
--- a/gitweb/static/js/javascript-detection.js
+++ b/gitweb/static/js/javascript-detection.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2007, Fredrik Kuivinen <frekui@gmail.com>
-//               2007, Petr Baudis <pasky@suse.cz>
+//               2007, Petr Baudis <pasky@ucw.cz>
 //          2008-2011, Jakub Narebski <jnareb@gmail.com>
 
 /**
diff --git a/gitweb/static/js/lib/common-lib.js b/gitweb/static/js/lib/common-lib.js
index 018bbb7..9c3c465 100644
--- a/gitweb/static/js/lib/common-lib.js
+++ b/gitweb/static/js/lib/common-lib.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2007, Fredrik Kuivinen <frekui@gmail.com>
-//               2007, Petr Baudis <pasky@suse.cz>
+//               2007, Petr Baudis <pasky@ucw.cz>
 //          2008-2011, Jakub Narebski <jnareb@gmail.com>
 
 /**
diff --git a/gitweb/static/js/lib/datetime.js b/gitweb/static/js/lib/datetime.js
index f78c60a..fdd46d3 100644
--- a/gitweb/static/js/lib/datetime.js
+++ b/gitweb/static/js/lib/datetime.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2007, Fredrik Kuivinen <frekui@gmail.com>
-//               2007, Petr Baudis <pasky@suse.cz>
+//               2007, Petr Baudis <pasky@ucw.cz>
 //          2008-2011, Jakub Narebski <jnareb@gmail.com>
 
 /**
diff --git a/perl/Git.pm b/perl/Git.pm
index 96cac39..7802afc 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1434,7 +1434,7 @@ sub git_cmd_try(&$) {
 
 =head1 COPYRIGHT
 
-Copyright 2006 by Petr Baudis E<lt>pasky@suse.czE<gt>.
+Copyright 2006 by Petr Baudis E<lt>pasky@ucw.czE<gt>.
 
 This module is free software; it may be used, copied, modified
 and distributed under the terms of the GNU General Public Licence,
-- 
Eric Wong

Re: [PATCH] update pasky's email address

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> Mail to pasky@suse.cz is bouncing.
>
> Signed-off-by: Eric Wong <normalperson@yhbt.net>
> ---
>  I noticed this when I attempted to reply to Thomas's email:
>  http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@inf.ethz.ch
>
>  .mailmap                                            | 1 +

Thanks, but I wonder if an entry update to .mailmap alone is
sufficient.

Especially, a change like this:

> index db6eb50..e162ec9 100644
> --- a/gitweb/static/js/blame_incremental.js
> +++ b/gitweb/static/js/blame_incremental.js
> @@ -1,5 +1,5 @@
>  // Copyright (C) 2007, Fredrik Kuivinen <frekui@gmail.com>
> -//               2007, Petr Baudis <pasky@suse.cz>
> +//               2007, Petr Baudis <pasky@ucw.cz>

makes me feel very uneasy and feels outright wrong; unless the
change by Petr in year 2007 was associated with the ucw.cz address,
not his then-current employer, that is.

Re: [PATCH] update pasky's email address

[Eric Wong]

Junio C Hamano <gitster@pobox.com> wrote:
> Eric Wong <normalperson@yhbt.net> writes:
> 
> > Mail to pasky@suse.cz is bouncing.
> >
> > Signed-off-by: Eric Wong <normalperson@yhbt.net>
> > ---
> >  I noticed this when I attempted to reply to Thomas's email:
> >  http://mid.gmane.org/f3d238a4c6cfbc6d68f2c4fa285aefa93acf4b7d.1365027616.git.trast@inf.ethz.ch
> >
> >  .mailmap                                            | 1 +
> 
> Thanks, but I wonder if an entry update to .mailmap alone is
> sufficient.

Gah, and somehow I got "suse.de" burned into my brain and screwed up
the .mailmap entry (should have been "suse.cz") :x

> Especially, a change like this:
> 
> > index db6eb50..e162ec9 100644
> > --- a/gitweb/static/js/blame_incremental.js
> > +++ b/gitweb/static/js/blame_incremental.js
> > @@ -1,5 +1,5 @@
> >  // Copyright (C) 2007, Fredrik Kuivinen <frekui@gmail.com>
> > -//               2007, Petr Baudis <pasky@suse.cz>
> > +//               2007, Petr Baudis <pasky@ucw.cz>
> 
> makes me feel very uneasy and feels outright wrong; unless the
> change by Petr in year 2007 was associated with the ucw.cz address,
> not his then-current employer, that is.

I understand your concern.  Perhaps keeping the old address with
a pointer to the current address?

             2007, Petr Baudis <pasky@suse.cz> (currently pasky@ucw.cz)

I'll wait for Petr's thoughts.

Re: [PATCH] update pasky's email address

[Petr Baudis]

  Hi!

On Thu, Apr 04, 2013 at 01:50:42AM +0000, Eric Wong wrote:
> Mail to pasky@suse.cz is bouncing.

  Oh, I totally forgot to take care of this. Thanks a lot for fixing it!

> Signed-off-by: Eric Wong <normalperson@yhbt.net>

  In general, Acked-by: Petr Baudis <pasky@ucw.cz>

On Thu, Apr 04, 2013 at 07:21:23AM +0000, Eric Wong wrote:
> Junio C Hamano <gitster@pobox.com> wrote:
> > Especially, a change like this:
> > 
> > > index db6eb50..e162ec9 100644
> > > --- a/gitweb/static/js/blame_incremental.js
> > > +++ b/gitweb/static/js/blame_incremental.js
> > > @@ -1,5 +1,5 @@
> > >  // Copyright (C) 2007, Fredrik Kuivinen <frekui@gmail.com>
> > > -//               2007, Petr Baudis <pasky@suse.cz>
> > > +//               2007, Petr Baudis <pasky@ucw.cz>
> > 
> > makes me feel very uneasy and feels outright wrong; unless the
> > change by Petr in year 2007 was associated with the ucw.cz address,
> > not his then-current employer, that is.
> 
> I understand your concern.  Perhaps keeping the old address with
> a pointer to the current address?
> 
>              2007, Petr Baudis <pasky@suse.cz> (currently pasky@ucw.cz)
> 
> I'll wait for Petr's thoughts.

  Frankly, I have no idea how to handle this well; is this the first
time such a change has to happen in Git? Your proposed form seems
formally correct but feels a bit cumbersome to me. :-)

  I think that if SUSE would like the email address to stay in the
original form, the best way to confirm their preference would be to keep
it actually functional.  Maybe Vojtech will have some thoughts on
whether that would be possibe or whether we should keep the address
inact.

  Kind regards,

-- 
				Petr "Pasky" Baudis
	For every complex problem there is an answer that is clear,
	simple, and wrong.  -- H. L. Mencken