From bfd52ccd688a1c7b85470538b25be6cf6608d347 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 28 Jul 2023 12:39:32 -0700 Subject: [PATCH] mailmap: Put sorted list back in order. Signed-off-by: Anders Kaseorg --- .mailmap | 40 ++++++++++++++++++++-------------------- tools/lint | 5 +++++ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.mailmap b/.mailmap index 0ebf887509..ecc03b71b9 100644 --- a/.mailmap +++ b/.mailmap @@ -12,31 +12,32 @@ # # shows raw names/emails, filtered by mapped name: # $ git log --format='%an %ae' --author=$NAME | uniq -c -acrefoot -acrefoot acrefoot -Adam Benesh +acrefoot +acrefoot Adam Benesh +Adam Benesh Adarsh Tiwari Alex Vandiver Alex Vandiver Allen Rabinovich Allen Rabinovich Alya Abbott <2090066+alya@users.noreply.github.com> -Aman Agrawal +Alya Abbott Aman Agrawal +Aman Agrawal Anders Kaseorg Anders Kaseorg -Aryan Shridhar <53977614+aryanshridhar@users.noreply.github.com> -Aryan Shridhar aparna-bhatt <86338542+aparna-bhatt@users.noreply.github.com> +Aryan Shridhar +Aryan Shridhar <53977614+aryanshridhar@users.noreply.github.com> Ashwat Kumar Singh Austin Riba BIKI DAS Brijmohan Siyag Brock Whittaker -Brock Whittaker Brock Whittaker +Brock Whittaker Chris Bobbe Chris Bobbe Danny Su @@ -59,19 +60,21 @@ Jeff Arnold Jeff Arnold Jessica McKellar Jessica McKellar +Joseph Ho +Joseph Ho <62449508+Joelute@users.noreply.github.com> Julia Bichler <74348920+juliaBichler01@users.noreply.github.com> Karl Stolley Kevin Mehall Kevin Mehall Kevin Scott Lalit Kumar Singh -Lauryn Menard Lauryn Menard <63245456+laurynmm@users.noreply.github.com> +Lauryn Menard +m-e-l-u-h-a-n +m-e-l-u-h-a-n Mateusz Mandera Matt Keller Matt Keller -m-e-l-u-h-a-n -m-e-l-u-h-a-n Noble Mittal <62551163+beingnoble03@users.noreply.github.com> nzai <70953556+nzaih1999@users.noreply.github.com> Palash Baderia @@ -82,10 +85,10 @@ Priyam Seth Ray Kraesig Reid Barton Rein Zustand (rht) +Rishabh Maheshwari Rishi Gupta Rishi Gupta Rishi Gupta -Rishabh Maheshwari Rixant Rokaha Rixant Rokaha Rixant Rokaha @@ -109,24 +112,21 @@ Tim Abbott Tim Abbott Tim Abbott Ujjawal Modi <99073049+Ujjawal3@users.noreply.github.com> -Vishnu KS -Vishnu KS -Alya Abbott umkay umkay -Waseem Daher +Vishnu KS +Vishnu KS Waseem Daher -Yash RE <33805964+YashRE42@users.noreply.github.com> +Waseem Daher Yash RE <33805964+YashRE42@users.noreply.github.com> +Yash RE <33805964+YashRE42@users.noreply.github.com> Yogesh Sirsat Yogesh Sirsat <41695888+yogesh-sirsat@users.noreply.github.com> -Zeeshan Equbal <54993043+zee-bit@users.noreply.github.com> Zeeshan Equbal +Zeeshan Equbal <54993043+zee-bit@users.noreply.github.com> Zev Benjamin Zev Benjamin Zev Benjamin Zixuan James Li -Zixuan James Li <39874143+PIG208@users.noreply.github.com> Zixuan James Li <359101898@qq.com> -Joseph Ho -Joseph Ho <62449508+Joelute@users.noreply.github.com> +Zixuan James Li <39874143+PIG208@users.noreply.github.com> diff --git a/tools/lint b/tools/lint index 70545206aa..2fc707ed91 100755 --- a/tools/lint +++ b/tools/lint @@ -194,6 +194,11 @@ def run() -> None: description="Syntactic grep (semgrep) code search tool (config: ./tools/semgrep.yml)", ) + linter_config.external_linter( + "mailmap", + ["sh", "-c", "grep '^[^#]' .mailmap | LC_ALL=C.UTF-8 sort -cf"], + description="Check that .mailmap is sorted", + ) linter_config.external_linter( "thirdparty", ["tools/check-thirdparty"],