contributors.sh: split lists using " and "

... and require the space after the filtering to make the filter able to
remove names.

1 files changed, 4 insertions, 2 deletions

diff --git a/contributors.sh b/contributors.sh
index de1944d62..9f0b10b33 100755
--- a/contributors.sh
+++ b/contributors.sh
@@ -35,9 +35,10 @@ fi
 # filter out Author:, Commit: and *by: lines
 # cut off the email parts
 # split list of names at comma
+# split list of names at " and "
 # cut off spaces first and last on the line
-# only count names with a space (ie more than one word)
 # filter alternatives through THANKS-filter
+# only count names with a space (ie more than one word)
 # sort all unique names
 # awk them into RELEASE-NOTES format
 git log $start..HEAD | \
@@ -45,9 +46,10 @@ egrep -i '(Author|Commit|by):' | \
 cut -d: -f2- | \
 cut '-d<' -f1 | \
 tr , '\012' | \
+sed 's/ and /\n/' | \
 sed -e 's/^ //' -e 's/ $//g' | \
-grep ' ' | \
 sed -f ./docs/THANKS-filter | \
+grep ' ' | \
 sort -fu | \
 awk '{
  num++;