build: deduplicate same authors with different casing

This commit is contained in:
Péter Szilágyi 2019-07-22 12:31:11 +03:00
parent 1a83114c74
commit b973eddd28
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D
2 changed files with 14 additions and 11 deletions

View File

@ -122,7 +122,6 @@ Gus <yo@soygus.com>
Gustav Simonsson <gustav.simonsson@gmail.com> Gustav Simonsson <gustav.simonsson@gmail.com>
Gísli Kristjánsson <gislik@hamstur.is> Gísli Kristjánsson <gislik@hamstur.is>
Ha ĐANG <dvietha@gmail.com> Ha ĐANG <dvietha@gmail.com>
hackyminer <hackyminer@gmail.com>
HackyMiner <hackyminer@gmail.com> HackyMiner <hackyminer@gmail.com>
hadv <dvietha@gmail.com> hadv <dvietha@gmail.com>
Hao Bryan Cheng <haobcheng@gmail.com> Hao Bryan Cheng <haobcheng@gmail.com>
@ -257,7 +256,6 @@ Paul Litvak <litvakpol@012.net.il>
Paulo L F Casaretto <pcasaretto@gmail.com> Paulo L F Casaretto <pcasaretto@gmail.com>
Paweł Bylica <chfast@gmail.com> Paweł Bylica <chfast@gmail.com>
Pedro Pombeiro <PombeirP@users.noreply.github.com> Pedro Pombeiro <PombeirP@users.noreply.github.com>
Pedro Pombeiro <pombeirp@users.noreply.github.com>
Peter Broadhurst <peter@themumbles.net> Peter Broadhurst <peter@themumbles.net>
Peter Pratscher <pratscher@gmail.com> Peter Pratscher <pratscher@gmail.com>
Petr Mikusek <petr@mikusek.info> Petr Mikusek <petr@mikusek.info>

View File

@ -275,27 +275,32 @@ func mailmapLookup(authors []string) []string {
} }
func writeAuthors(files []string) { func writeAuthors(files []string) {
merge := make(map[string]bool) var (
dedup = make(map[string]bool)
list []string
)
// Add authors that Git reports as contributors. // Add authors that Git reports as contributors.
// This is the primary source of author information. // This is the primary source of author information.
for _, a := range gitAuthors(files) { for _, a := range gitAuthors(files) {
merge[a] = true if la := strings.ToLower(a); !dedup[la] {
list = append(list, a)
dedup[la] = true
}
} }
// Add existing authors from the file. This should ensure that we // Add existing authors from the file. This should ensure that we
// never lose authors, even if Git stops listing them. We can also // never lose authors, even if Git stops listing them. We can also
// add authors manually this way. // add authors manually this way.
for _, a := range readAuthors() { for _, a := range readAuthors() {
merge[a] = true if la := strings.ToLower(a); !dedup[la] {
list = append(list, a)
dedup[la] = true
}
} }
// Write sorted list of authors back to the file. // Write sorted list of authors back to the file.
var result []string sort.Sort(authors(list))
for a := range merge {
result = append(result, a)
}
sort.Sort(authors(result))
content := new(bytes.Buffer) content := new(bytes.Buffer)
content.WriteString(authorsFileHeader) content.WriteString(authorsFileHeader)
for _, a := range result { for _, a := range list {
content.WriteString(a) content.WriteString(a)
content.WriteString("\n") content.WriteString("\n")
} }