diff options
Diffstat (limited to 'scripts/contributors.sh')
| -rwxr-xr-x | scripts/contributors.sh | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/scripts/contributors.sh b/scripts/contributors.sh index 0840bfab..d62baade 100755 --- a/scripts/contributors.sh +++ b/scripts/contributors.sh @@ -6,11 +6,11 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2013-2015, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2013-2016, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. +# are also available at https://curl.haxx.se/docs/copyright.html. # # You may opt to use, copy, modify, merge, publish, distribute and/or sell # copies of the Software, and permit persons to whom the Software is @@ -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 @@ -48,31 +45,26 @@ fi # awk them into RELEASE-NOTES format ( git log $start..HEAD | \ -egrep -i '(Author|Commit|by):' | \ +egrep -ai '(^Author|^Commit|by):' | \ cut -d: -f2- | \ cut '-d<' -f1 | \ tr , '\012' | \ sed 's/ and /\n/' | \ -sed -e 's/^ //' -e 's/ $//g' +sed -e 's/^ //' -e 's/ $//g' -e 's/@users.noreply.github.com$/ on github/' -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| \ +grep -a "^ [^ \(]" RELEASE-NOTES| \ sed 's/, */\n/g'| \ sed 's/^ *//' -fi + )| \ sed -f ./docs/THANKS-filter | \ -grep ' ' | \ +grep -a ' ' | \ sort -fu | \ awk '{ num++; n = sprintf("%s%s%s,", n, length(n)?" ":"", $0); #print n; - if(length(n) > 78) { + if(length(n) > 77) { printf(" %s\n", p); n=sprintf("%s,", $0); } |