Fix for server/main and update contributors

MariaDB · Oct 8, 2024 · af7fb3e · af7fb3e
1 parent 83c3726
commit af7fb3e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/commits/config/aliases b/commits/config/aliases
@@ -75,6 +75,7 @@ nayuta.yanagisawa@hey.com                       nayuta.yanagisawa@mariadb.com
 olegs@teramind.co                               olernov@gmail.com
 otto@debian.org                                 otto@kekalainen.net
 otto@seravo.fi                                  otto@seravo.com
+pkubaj@users.noreply.github.com                 pkubaj@anongoth.pl
 plinel@mendel-master2.cm.cluster                patrice.linel@genusplc.com
 razze@iki.fi                                    rasmus@mariadb.com
 rnozdrin@mariadb.com                            roman.nozdrin@mariadb.com

diff --git a/commits/config/categories b/commits/config/categories
@@ -39,6 +39,7 @@ CHECK24                   Provider
 Chainguard                Provider
 CONNECT                   Provider
 ClearCode                 Provider
+ClickHouse                Provider
 Codership                 Provider
 Comcast                   Provider
 Dataworkz                 Provider
@@ -58,6 +59,7 @@ Huawei                    Provider
 IBM                       Sponsor
 Independent               Other
 InfoSiftr                 Provider
+IONOS                     Sponsor
 JFrog                     Provider
 Kitware                   Provider
 Kontron                   Provider
@@ -75,6 +77,7 @@ Otto                      Provider
 OVHcloud                  Provider
 Percona                   Sponsor
 PingCAP                   Provider
+Rakuten                   Provider
 Rechnerherz               Provider
 ScaleFlux                 Provider
 Seravo                    Provider

diff --git a/commits/config/domain-map b/commits/config/domain-map
@@ -23,6 +23,7 @@ genusplc.com        Genus
 huawei.com          Huawei
 ibm.com             IBM
 infosiftr.com       InfoSiftr
+ionos.com           IONOS
 jacob.de            Jacob Elektronik
 jd.com              JD.com (Jingdong)
 kali.org            Kali Linux
@@ -47,6 +48,7 @@ oracle.com          Oracle Corporation
 otto.de             Otto
 ovhcloud.com        OVHcloud
 percona.com         Percona
+rakuten-sec.co.jp   Rakuten
 redhat.com          Red Hat
 scaleflux.com       ScaleFlux
 service-now.com     ServiceNow

diff --git a/commits/config/employers b/commits/config/employers
@@ -32,6 +32,7 @@ a.buddenbrock@gmail.com                             Finanz Informatik
 A00279809@student.ait.ie                            Independent
 a089902@gmail.com                                   Independent
 a2sin2a2ko@kyoto-y.work                             Independent
+a3at.mail@gmail.com                                 ClickHouse
 a97410985new@gmail.com                              GSoC
 admwiggin@gmail.com                                 Docker
 AddisonG@users.noreply.github.com                   Independent
@@ -77,6 +78,7 @@ eirinikos@gmail.com                                 Independent
 fontaine.fabrice@gmail.com                          Orange
 fxcoudert@gmail.com                                 Independent
 geert@hendrickx.be                                  Independent
+gentlmanjun@naver.com                               Independent
 giordano@users.noreply.github.com                   University College London
 github.com@daniel-rudolf.de                         SGS Serious Gaming & Simulations GmbH
 github@darkain.com                                  Independent
@@ -178,9 +180,11 @@ otto@kekalainen.net                                 Amazon
 pali@cpan.org                                       Independent
 patrakov@gmail.com                                  Independent
 papava.e@gtu.ge                                     Independent
+paradox.ver5@gmail.com                              GSoC
 pasha.bolokhov@gmail.com                            Independent
 pavlich_eng00@mail.ru                               Independent
-pkubaj@users.noreply.github.com                     HardenedBSD
+pinkfreud@users.noreply.github.com                  Independent
+pkubaj@anongoth.pl                                  HardenedBSD
 plainbanana@mustardon.tokyo                         Independent
 pmacontrol@68koncept.com                            Independent
 psz@maths.usyd.edu.au                               University of Sydney
@@ -214,7 +218,9 @@ tildeslash@users.noreply.github.com                 Tildeslash
 tkngsnsk313320@gmail.com                            Independent
 tmgross@umich.edu                                   Independent
 tomookam@live.jp                                    Amazon
+trixpan@users.noreply.github.com                    Independent
 tuukka.pasanen@ilmi.fi                              MariaDB Foundation
+tvdijen@gmail.com                                   Independent
 u16suzu@gmail.com                                   Independent
 uilianries@gmail.com                                JFrog
 unki@users.noreply.github.com                       Independent

diff --git a/commits/parse_git_log.sh b/commits/parse_git_log.sh
@@ -26,7 +26,7 @@ if [ $4 -eq 0 ]; then
 fi
 echo "Extracting git log"
 if [ $TREE = "server" ]; then
-    BRANCHES="--remotes=\"*/10.[0-9]\" --remotes=\"*/10.1[0-9]\" --remotes=\"*/11.[0-9]\""
+    BRANCHES="--remotes=\"*/10.[0-9]\" --remotes=\"*/10.1[0-9]\" --remotes=\"*/11.[0-9]\" --remotes=\"*/main\""
 elif [ $TREE = "mariadb-columnstore-engine" ]; then
     BRANCHES="--remotes=\"*/develo?\" --remotes=\"*/develop-1.[0-9]\" --remotes=\"*/develop-[5-9]\"  --remotes=\"*/develop-2[0-9].[0-9][0-9]\""
 elif [ $TREE = "mariadb-connector-c" ]; then