From 43a7e5f238ab658ca7e7f3b05264b06411d93f2d Mon Sep 17 00:00:00 2001
From: Aaron Meurer <asmeurer@gmail.com>
Date: Fri, 22 Feb 2019 14:40:02 -0700
Subject: [PATCH] Update AUTHORS and .mailmap

---
 .mailmap              | 10 ++++++++++
 AUTHORS               | 18 +++++++++++++++++-
 bin/authors_update.py |  2 ++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 37f68ffdd1e9..9338d58a44d4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -394,6 +394,10 @@ Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <gdp.1807@gmail.com>
 Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <36567889+czgdp1807@users.noreply.github.com>
 Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <czgdp1807@gmail.com>
 Gagandeep Singh <singh.23@iitj.ac.in> MathLover <36567889+czgdp1807@users.noreply.github.com>
+Gagandeep Singh <singh.23@iitj.ac.in> czgdp1807 <singh.23@iitj.ac.in>
+Gagandeep Singh <singh.23@iitj.ac.in> Gagandeep Singh <36567889+czgdp1807@users.noreply.github.com>
+Gagandeep Singh <singh.23@iitj.ac.in> Gagandeep Singh <czgdp1807@gmail.com>
+Gagandeep Singh <singh.23@iitj.ac.in> Gagandeep Singh <singh.23@iitj.ac.in>
 S.Y. Lee <sylee957@gmail.com> sylee957 <sylee957@gmail.com>
 Yatna Verma <yatnavermaa@gmail.com> yatna <yatnavermaa@gmail.com>
 Jared Lumpe <mjlumpe@gmail.com> Michael Jared Lumpe <mjlumpe@gmail.com>
@@ -403,3 +407,9 @@ amsuhane <ayushsuhane99@iitkgp.ac.in> amsuhane <“ayushsuhane99@iitkgp.ac.in”
 Ritu Raj Singh <RituRajSingh878@gmail.com> Ritu Raj Singh <37741324+RituRajSingh878@users.noreply.github.com>
 Ritu Raj Singh <RituRajSingh878@gmail.com> RituRajSingh878 <RituRajSingh878@gmail.com>
 rationa-kunal <kunalgk1999@gmail.com> kunal <kunalgk1999@protonmail.com>
+shiksha11 <shiksharawat01@gmail.com> shiksha11 <33157995+shiksha11@users.noreply.github.com>
+Jogi Miglani <jmig5776@gmail.com> jmig5776 <jmig5776@gmail.com>
+Supreet Agrawal <supreet11agrawal@gmail.com> stm <supreet11agrawal@gmail.com>
+Bavish Kulur <bavishkulur@gmail.com> bavish2201 <bavishkulur@gmail.com>
+Divyanshu Thakur <divyanshu@iiitmanipur.ac.in> Divyanshu <divyanshu@iiitmanipur.ac.in>
+Shubham Kumar Jha <skjha832@gmail.com> ShubhamKJha <skjha832@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 3f288c13e1b8..525bc9cb7586 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,7 +4,7 @@ those who explicitly didn't want to be mentioned. People with a * next
 to their names are not found in the metadata of the git history. This
 file is generated automatically by running `./bin/authors_update.py`.
 
-There are a total of 782 authors.
+There are a total of 798 authors.
 
 Ondřej Čertík <ondrej@certik.cz>
 Fabian Pedregosa <fabian@fseoane.net>
@@ -788,3 +788,19 @@ Ritu Raj Singh <RituRajSingh878@gmail.com>
 Rajiv Ranjan Singh <42106787+iamrajiv@users.noreply.github.com>
 Vera Lozhkina <veralozhkina@gmail.com>
 adhoc-king <46354827+adhoc-king@users.noreply.github.com>
+Mikel Rouco <mikel.mrm@gmail.com>
+Oscar Gustafsson <oscar.gustafsson@gmail.com>
+damianos <damianos@semmle.com>
+Supreet Agrawal <supreet11agrawal@gmail.com>
+shiksha11 <shiksharawat01@gmail.com>
+Martin Ueding <dev@martin-ueding.de>
+sharma-kunal <kunalsharma6914@gmail.com>
+Divyanshu Thakur <divyanshu@iiitmanipur.ac.in>
+Susumu Ishizuka <susumu.ishizuka@kii.com>
+Samnan Rahee <namanush.rsr.16@gmail.com>
+Fredrik Andersson <fredrik.andersson@fcc.chalmers.se>
+Bhavya Srivastava <bhavya17037@iiitd.ac.in>
+Alpesh Jamgade <alpeshjamgade21@gmail.com>
+Shubham Abhang <shubhamabhang77@gmail.com>
+Vishesh Mangla <manglavishesh64@gmail.com>
+Nicko van Someren <nicko@nicko.org>
diff --git a/bin/authors_update.py b/bin/authors_update.py
index 0fcf4ff2d785..0362356f15af 100755
--- a/bin/authors_update.py
+++ b/bin/authors_update.py
@@ -94,6 +94,8 @@ def move(l, i1, i2, who):
         ), 'Sergey B Kirpichev was not found at line 226.'
     assert 'azure-pipelines[bot]' == \
         author_name(git_people.pop(751)), 'azure-pipelines[bot] was not found at line 751'
+    assert 'whitesource-bolt-for-github[bot]' == \
+        author_name(git_people.pop(792)), 'whitesource-bolt-for-github[bot] not found at line 792'
 except AssertionError as msg:
     print(red(msg))
     sys.exit(1)