internal/gophers: restore valid Gerrit emails (again)
This is a cherry-pick of CL 135456 that restores Gerrit emails
for some people that were incorrectly changed in CL 165639, with
manual no-op addPerson line merges to address code review comments.
The cherry-pick applied very cleanly with just two minor merge
conflicts: one due to a Filippo's email already being fixed in
CL 176037, and another due to a close new entry.
Add tests to catch this from happening again, until the source
of the problem is resolved in issue golang/go#34259.
Updates golang/go#34259
Updates golang/go#28320
Updates golang/go#31919
Updates golang/go#27517
Updates golang/go#27631
Change-Id: Ia03a2b94403334d3f571ac5623e12d3bfd6f1e4f
Reviewed-on: https://go-review.googlesource.com/c/build/+/195062
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/internal/gophers/gophers.go b/internal/gophers/gophers.go
index d4f6256..8696194 100644
--- a/internal/gophers/gophers.go
+++ b/internal/gophers/gophers.go
@@ -309,11 +309,7 @@
addPerson("Andres Erbsen", "andres.erbsen@gmail.com")
addPerson("Andrew Austin", "andrewaclt@gmail.com", "@andrewaustin")
addPerson("Andrew Benton", "andrewmbenton@gmail.com", "@andrewmbenton")
- addPerson("Andrew Bonventre", "365204+andybons@users.noreply.github.com")
- addPerson("Andrew Bonventre", "andybons@golang.org", "22285@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Andrew Bonventre", "andybons@golang.org", "andybons@gmail.com", "@andybons")
- addPerson("Andrew Bonventre", "andybons@google.com", "10660@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Andrew Bonventre", "hello@obvy.co")
+ addPerson("Andrew Bonventre", "andybons@golang.org", "andybons@gmail.com", "@andybons", "365204+andybons@users.noreply.github.com", "22285@62eb7196-b449-3ce5-99f1-c037f21e1705", "andybons@google.com", "10660@62eb7196-b449-3ce5-99f1-c037f21e1705", "hello@obvy.co")
addPerson("Andrew Brampton", "bramp@google.com")
addPerson("Andrew Braunstein", "awbraunstein@gmail.com", "@awbraunstein")
addPerson("Andrew Ekstedt", "andrew.ekstedt@gmail.com", "6255@62eb7196-b449-3ce5-99f1-c037f21e1705")
@@ -554,10 +550,7 @@
addPerson("Carl Jackson", "carl@stripe.com", "@carl-stripe")
addPerson("Carl Johnson", "me@carlmjohnson.net", "12425@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Carl Johnson", "me@carlmjohnson.net", "@carlmjohnson")
- addPerson("Carl Mastrangelo", "carl.mastrangelo@gmail.com")
- addPerson("Carl Mastrangelo", "carlmastrangelo@gmail.com")
- addPerson("Carl Mastrangelo", "notcarl@google.com", "12225@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Carl Mastrangelo", "notcarl@google.com", "@carl-mastrangelo")
+ addPerson("Carl Mastrangelo", "notcarl@google.com", "@carl-mastrangelo", "carl.mastrangelo@gmail.com", "carlmastrangelo@gmail.com", "12225@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Carlisia Campos", "carlisia@grokkingtech.io", "@carlisia")
addPerson("Carlo Alberto Ferraris", "cafxx@strayorange.com", "11500@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Carlo Alberto Ferraris", "cafxx@strayorange.com", "@CAFxX")
@@ -862,8 +855,7 @@
addPerson("Dirk Gadsden", "dirk@esherido.com", "@dirk")
addPerson("Diwaker Gupta", "diwakergupta@gmail.com", "@diwakergupta")
addPerson("Dmitri Popov", "operator@cv.dp-net.com", "@pin")
- addPerson("Dmitri Shuralyov", "dmitshur@golang.org", "6005@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Dmitri Shuralyov", "dmitshur@golang.org", "dmitri@shuralyov.com", "shurcool@gmail.com", "@dmitshur")
+ addPerson("Dmitri Shuralyov", "dmitshur@golang.org", "dmitri@shuralyov.com", "shurcool@gmail.com", "@dmitshur", "6005@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Dmitriy Dudkin", "dudkin.dmitriy@gmail.com", "@tmwh")
addPerson("Dmitriy", "dchenk@users.noreply.github.com")
addPerson("Dmitry Chestnykh", "dchest@gmail.com", "@dchest")
@@ -945,9 +937,9 @@
addPerson("Eric Garrido", "ekg@google.com", "@minusnine")
addPerson("Eric Hopper", "hopper@omnifarious.org")
addPerson("Eric Koleda", "ekoleda+devrel@google.com")
+ addPerson("Eric Lagergren", "ericscottlagergren@gmail.com", "@ericlagergren")
addPerson("Eric Lagergren", "eric@ericlagergren.com", "@ericlagergren")
addPerson("Eric Lagergren", "ericscottlagergren@gmail.com", "7276@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Eric Lagergren", "ericscottlagergren@gmail.com", "@ericlagergren")
addPerson("Eric Milliken", "emilliken@gmail.com", "@emilliken")
addPerson("Eric Pauley", "eric@pauley.me", "@ericpauley")
addPerson("Eric Ponce", "tricokun@gmail.com", "@trico")
@@ -1121,8 +1113,8 @@
addPerson("Guilherme Rezende", "guilhermebr@gmail.com", "@guilhermebr")
addPerson("Guilherme Santos", "guilherme.santos@foodora.com")
addPerson("GuilhermeCaruso", "gui.martinscaruso@gmail.com", "@GuilhermeCaruso")
- addPerson("Guillaume J. Charmes", "gcharmes@magicleap.com")
addPerson("Guillaume J. Charmes", "guillaume@charmes.net", "@creack")
+ addPerson("Guillaume J. Charmes", "gcharmes@magicleap.com")
addPerson("Guillaume Koenig", "guillaume.edward.koenig@gmail.com")
addPerson("Guillaume Leroi", "leroi.g@gmail.com")
addPerson("Guillermo López-Anglada", "guillermo.lopez@outlook.com", "@guillermooo")
@@ -1154,9 +1146,9 @@
addPerson("Hari haran", "hariharan.uno@gmail.com", "@hariharan-uno")
addPerson("Hariharan Srinath", "srinathh@gmail.com", "@srinathh")
addPerson("Harry Moreno", "morenoh149@gmail.com", "@morenoh149")
+ addPerson("Harshavardhana", "hrshvardhana@gmail.com", "@harshavardhana")
addPerson("Harshavardhana", "harsha@minio.io")
addPerson("Harshavardhana", "hrshvardhana@gmail.com", "11900@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Harshavardhana", "hrshvardhana@gmail.com", "@harshavardhana")
addPerson("Hauke Löffler", "hloeffler@users.noreply.github.com", "@hloeffler")
addPerson("He Liu", "liulonnie@gmail.com")
addPerson("Hector Chu", "hectorchu@gmail.com", "@hectorchu")
@@ -1434,9 +1426,9 @@
addPerson("Joe Shaw", "joe@joeshaw.org", "@joeshaw")
addPerson("Joe Sylve", "joe.sylve@gmail.com", "11851@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Joe Sylve", "joe.sylve@gmail.com", "@jtsylve")
+ addPerson("Joe Tsai", "joetsai@google.com", "joetsai@digital-static.net", "thebrokentoaster@gmail.com", "@dsnet")
addPerson("Joe Tsai", "joetsai@digital-static.net", "8495@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Joe Tsai", "joetsai@google.com", "12850@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Joe Tsai", "joetsai@google.com", "joetsai@digital-static.net", "thebrokentoaster@gmail.com", "@dsnet")
addPerson("Joe Tsai", "thebrokentoaster@gmail.com", "9735@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Joel Sing", "joel@sing.id.au", "13640@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Joel Sing", "joel@sing.id.au", "jsing@google.com", "@4a6f656c")
@@ -1814,9 +1806,9 @@
addPerson("Martin Kunc", "mk@Martins-MacBook-Pro.local")
addPerson("Martin Lee", "martin@martinlee.org")
addPerson("Martin Lindhe", "martin.j.lindhe@gmail.com", "@martinlindhe")
+ addPerson("Martin Möhrmann", "moehrmann@google.com", "martisch@uos.de", "@martisch")
addPerson("Martin Möhrmann", "martisch@uos.de", "5846@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Martin Möhrmann", "moehrmann@google.com", "16006@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Martin Möhrmann", "moehrmann@google.com", "martisch@uos.de", "@martisch")
addPerson("Martin Olsen", "github.com@martinolsen.net", "@martinolsen")
addPerson("Martin Olsson", "martin@minimum.se", "@mo")
addPerson("Martin Probst", "martin@probst.io")
@@ -1871,9 +1863,9 @@
addPerson("Matthew Broberg", "matthewbbroberg@gmail.com")
addPerson("Matthew Byrne", "mjw.byrne@gmail.com")
addPerson("Matthew Cottingham", "mattcottingham@gmail.com", "@mattrco")
+ addPerson("Matthew Dempsky", "mdempsky@google.com", "@mdempsky")
addPerson("Matthew Dempsky", "matthew@dempsky.org", "8715@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Matthew Dempsky", "mdempsky@google.com", "5440@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Matthew Dempsky", "mdempsky@google.com", "@mdempsky")
addPerson("Matthew Denton", "mdenton@skyportsystems.com", "@mdentonSkyport")
addPerson("Matthew Endsley", "mendsley@gmail.com")
addPerson("Matthew Herrmann", "mherr@google.com")
@@ -2165,9 +2157,9 @@
addPerson("Paul Chang", "paulchang@google.com", "@pchx")
addPerson("Paul Gier", "pgier@redhat.com")
addPerson("Paul Hankin", "paulhankin@google.com")
+ addPerson("Paul Jolly", "paul@myitcv.org.uk", "@myitcv")
addPerson("Paul Jolly", "paul@myitcv.io", "@myitcv")
addPerson("Paul Jolly", "paul@myitcv.org.uk", "16375@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Paul Jolly", "paul@myitcv.org.uk", "@myitcv")
addPerson("Paul Lalonde", "paul.a.lalonde@gmail.com", "@paul-lalonde")
addPerson("Paul M Furley", "paul@paulfurley.com")
addPerson("Paul Marks", "pmarks@google.com", "6050@62eb7196-b449-3ce5-99f1-c037f21e1705")
@@ -2298,8 +2290,8 @@
addPerson("Rajat Goel", "rajat.goel2010@gmail.com", "@rajatgoel")
addPerson("Rajath Agasthya", "rajathagasthya@gmail.com", "24258@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Rajath Agasthya", "rajathagasthya@gmail.com", "@rajathagasthya")
- addPerson("Ralph Corderoy", "ralph.corderoy@gmail.com", "7020@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Ralph Corderoy", "ralph@inputplus.co.uk")
+ addPerson("Ralph Corderoy", "ralph.corderoy@gmail.com", "7020@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Ralph Corderoy", "ralph@inputplus.co.uk", "10961@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Ralph Corderoy", "ralph@inputplus.co.uk", "@RalphCorderoy")
addPerson("Ralph Ligtenberg", "ralph.ligtenberg@gmail.com")
@@ -2309,9 +2301,9 @@
addPerson("Randy Reddig", "ydnar@shaderlab.com")
addPerson("Raph Levien", "raph@google.com", "@raphlinus")
addPerson("Raphael Geronimi", "raphael.geronimi@gmail.com", "@rgeronimi")
+ addPerson("Raul Silvera", "rsilvera@google.com", "@rauls5382")
addPerson("Raul Silvera", "rauls5382@gmail.com")
addPerson("Raul Silvera", "rsilvera@google.com", "10031@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Raul Silvera", "rsilvera@google.com", "@rauls5382")
addPerson("RaviTeja", "ravi.tezu@gmail.com")
addPerson("Ray Tung", "rtung@thoughtworks.com", "@raytung")
addPerson("Raymond Kazlauskas", "raima220@gmail.com", "@Rhymond")
@@ -2474,9 +2466,9 @@
addPerson("Sebastian Schmidt", "mrschmidt@google.com")
addPerson("Sebastian Schuberth", "sschuberth@gmail.com")
addPerson("Sebastian Willing", "sewi.de@gmail.com")
+ addPerson("Sebastien Binet", "seb.binet@gmail.com", "@sbinet")
addPerson("Sebastien Binet", "binet@cern.ch")
addPerson("Sebastien Binet", "seb.binet@gmail.com", "5810@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Sebastien Binet", "seb.binet@gmail.com", "@sbinet")
addPerson("Seebs", "seebs@sourcegraph.com", "@seebs")
addPerson("Seiji Takahashi", "timaki.st@gmail.com", "15570@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Seiji Takahashi", "timaki.st@gmail.com", "@timakin")
@@ -2681,9 +2673,9 @@
addPerson("Tipp Moseley", "tipp@google.com", "@tippjammer")
addPerson("Tobias Assarsson", "tobias.assarsson@gmail.com")
addPerson("Tobias Columbus", "tobias.columbus@gmail.com", "@tc-0")
+ addPerson("Tobias Klauser", "tobias.klauser@gmail.com", "@tklauser")
addPerson("Tobias Klauser", "tklauser@distanz.ch", "@tklauser")
addPerson("Tobias Klauser", "tobias.klauser@gmail.com", "19560@62eb7196-b449-3ce5-99f1-c037f21e1705")
- addPerson("Tobias Klauser", "tobias.klauser@gmail.com", "@tklauser")
addPerson("Tobias Schottdorf", "tobias.schottdorf@gmail.com")
addPerson("Toby Burress", "kurin@google.com")
addPerson("Todd Neal", "todd@tneal.org", "12836@62eb7196-b449-3ce5-99f1-c037f21e1705")
@@ -2769,8 +2761,8 @@
addPerson("Vincenzo Pupillo", "v.pupillo@gmail.com", "24134@62eb7196-b449-3ce5-99f1-c037f21e1705")
addPerson("Vinu Rajashekhar", "vinutheraj@gmail.com", "@vinuraja")
addPerson("Vishvananda Ishaya", "vishvananda@gmail.com", "@vishvananda")
- addPerson("Vitor De Mario", "vitor.demario@mendelics.com.br")
addPerson("Vitor De Mario", "vitordemario@gmail.com", "@vdemario")
+ addPerson("Vitor De Mario", "vitor.demario@mendelics.com.br")
addPerson("Vivek Ayer", "vivek@restlessbandit.com")
addPerson("Vivek Sekhar", "vivek@viveksekhar.ca")
addPerson("Vlad Krasnov", "vlad@cloudflare.com", "7601@62eb7196-b449-3ce5-99f1-c037f21e1705")
diff --git a/internal/gophers/gophers_test.go b/internal/gophers/gophers_test.go
new file mode 100644
index 0000000..f2fdad8
--- /dev/null
+++ b/internal/gophers/gophers_test.go
@@ -0,0 +1,51 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package gophers_test
+
+import (
+ "testing"
+
+ "golang.org/x/build/internal/gophers"
+)
+
+// Test that a few people whose Gerrit emails have been broken
+// in the past still have the expected Gerrit email. This test
+// is mostly needed until golang.org/issue/34259 is resolved.
+func TestGerritEmail(t *testing.T) {
+ for _, tt := range []struct {
+ id string
+ want string
+ }{
+ {id: "Andrew Bonventre", want: "andybons@golang.org"},
+ {id: "Carl Mastrangelo", want: "notcarl@google.com"},
+ {id: "Chris McGee", want: "newton688@gmail.com"},
+ {id: "Eric Lagergren", want: "ericscottlagergren@gmail.com"},
+ {id: "Filippo Valsorda", want: "filippo@golang.org"},
+ {id: "Guillaume J. Charmes", want: "guillaume@charmes.net"},
+ {id: "Harshavardhana", want: "hrshvardhana@gmail.com"},
+ {id: "Jean de Klerk", want: "deklerk@google.com"},
+ {id: "Joe Tsai", want: "joetsai@google.com"},
+ {id: "Martin Möhrmann", want: "moehrmann@google.com"},
+ {id: "Matthew Dempsky", want: "mdempsky@google.com"},
+ {id: "Olivier Poitrey", want: "rs@netflix.com"},
+ {id: "Paul Jolly", want: "paul@myitcv.org.uk"},
+ {id: "Ralph Corderoy", want: "ralph@inputplus.co.uk"},
+ {id: "Raul Silvera", want: "rsilvera@google.com"},
+ {id: "Richard Miller", want: "millerresearch@gmail.com"},
+ {id: "Sebastien Binet", want: "seb.binet@gmail.com"},
+ {id: "Tobias Klauser", want: "tobias.klauser@gmail.com"},
+ {id: "Vitor De Mario", want: "vitordemario@gmail.com"},
+ } {
+ p := gophers.GetPerson(tt.id)
+ if p == nil {
+ t.Errorf("no person with id %q", tt.id)
+ continue
+ }
+ got := p.Gerrit
+ if got != tt.want {
+ t.Errorf("person with id %q now has Gerrit email %q but used to have %q; is that change intentional?", tt.id, got, tt.want)
+ }
+ }
+}
