aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-04-22 15:53:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-04-22 15:53:42 +0200
commitc67d7b940592a8a8f52b78052e911c3077db30a0 (patch)
treec4328806460fb883aad440ffb3273d980ee90e07
parent610b9cdccf8141a40d1c835a3cd7194db7771393 (diff)
contributors.sh: make --releasenotes implied
It got too annoying to type =)
-rwxr-xr-xscripts/contributors.sh16
1 files changed, 4 insertions, 12 deletions
diff --git a/scripts/contributors.sh b/scripts/contributors.sh
index a4eec0d2e..88386109f 100755
--- a/scripts/contributors.sh
+++ b/scripts/contributors.sh
@@ -22,12 +22,9 @@
###########################################################################
#
-# This script shows all mentioned contributors from <hash> until HEAD. To aid
-# when writing RELEASE-NOTES and THANKS.
-#
-# Use --releasenotes to also include the names from the existing RELEASE-NOTES
-# file, which is handy when we've added names manually in there that should be
-# included in an updated list.
+# This script shows all mentioned contributors from the given <hash>/<tag>
+# until HEAD and adds the contributors already mentioned in the existing
+# RELEASE-NOTES.
#
start=$1
@@ -55,15 +52,10 @@ tr , '\012' | \
sed 's/ and /\n/' | \
sed -e 's/^ //' -e 's/ $//g'
-if echo "$*" | grep -qw -- '--releasenotes';then
- # if --releasenotes was used
- # grep out the list of names from RELEASE-NOTES
- # split on ", "
- # remove leading white spaces
grep "^ [^ \(]" RELEASE-NOTES| \
sed 's/, */\n/g'| \
sed 's/^ *//'
-fi
+
)| \
sed -f ./docs/THANKS-filter | \
grep ' ' | \