about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorarcnmx <arcnmx@users.noreply.github.com>2015-11-14 23:11:20 -0500
committerarcnmx <arcnmx@users.noreply.github.com>2015-11-14 23:11:20 -0500
commitd84d92bbdd049aafd7962d2133bd91b2afcfdad5 (patch)
tree25ef250fa1857683121ae18bda75e0f9b3e33a22 /src
parent4f5edf9e386f9ee7ed3f34edbaa3b71bd574c207 (diff)
downloadrust-d84d92bbdd049aafd7962d2133bd91b2afcfdad5.tar.gz
rust-d84d92bbdd049aafd7962d2133bd91b2afcfdad5.zip
AUTHORS and .mailmap cleanup
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/etc/add-authors.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/add-authors.sh b/src/etc/add-authors.sh
index 3ae0ec73957..e45b803fa07 100644..100755
--- a/src/etc/add-authors.sh
+++ b/src/etc/add-authors.sh
@@ -30,8 +30,8 @@ range="$1"
 authors_file="./AUTHORS.txt"
 tmp_file="./AUTHORS.txt.tmp"
 old_authors="$(cat "$authors_file" | tail -n +2 | sed "/^$/d" | sort)"
-new_authors="$(git log "$range" --format="%aN <%aE>" | sort | uniq)"
+new_authors="$(git log "$range" --use-mailmap --format="%aN <%aE>" | sort | uniq)"
 
 printf "%s\n\n" "Rust was written by these fine people:" > "$tmp_file"
-printf "%s\n%s" "$old_authors" "$new_authors" | sort | uniq >> "$tmp_file"
+printf "%s\n%s" "$old_authors" "$new_authors" | sort -fs | uniq >> "$tmp_file"
 mv -f "$tmp_file" "$authors_file"