From b3b33fa3aa292459393f12ae418f31ebb2076c42 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 30 Nov 2023 11:55:27 +0900
Subject: [PATCH] contrib: include co-authors to the contributor list of NEWS

Closes #30261.
---
 tools/git-contrib.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/git-contrib.sh b/tools/git-contrib.sh
index cde1ecd..6371d49 100755
--- a/tools/git-contrib.sh
+++ b/tools/git-contrib.sh
@@ -3,7 +3,12 @@
 set -eu
 
 tag="$(git describe --abbrev=0 --match 'v[0-9][0-9][0-9]')"
-git log --pretty=tformat:%aN -s "${tag}.." |
+(
+    # authors
+    git log --pretty=tformat:%aN -s "${tag}.."
+    # Co-authors (drop empty line and mail addresses)
+    git log --pretty='tformat:%(trailers:key=Co-authored-by,valueonly)' -s "${tag}.." | sed -e '/^[[:space:]]*$/ d' | sed -e 's/ <.*@.*>$//'
+) |
     grep -v noreply@weblate.org |
     sed 's/ / /g; s/--/-/g; s/.*/\0,/' |
     sort -u | tr '\n' ' ' | sed -e "s/^/Contributions from: /g" -e "s/,\s*$/\n/g" | fold -w 72 -s |
-- 
2.7.4