aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2020-02-05 11:45:47 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-02-05 13:54:16 +0100
commit8a5c1cf1f0ee6e3ed7c12b37bb290c209321f21e (patch)
treebc1380493aa7d38c873a12155102fe02997f4934
parentd2411a78ee417570fb2f3ced2094917a32e31583 (diff)
contributors: Also include people who contributed to curl-www
Closes #4884
-rwxr-xr-xscripts/contributors.sh14
-rwxr-xr-xscripts/contrithanks.sh15
2 files changed, 27 insertions, 2 deletions
diff --git a/scripts/contributors.sh b/scripts/contributors.sh
index 0bb16ec00..6a6d34484 100755
--- a/scripts/contributors.sh
+++ b/scripts/contributors.sh
@@ -38,6 +38,11 @@ if test -z "$start"; then
echo "Since $start:"
fi
+# We also include curl-www if possible. Override by setting CURLWWW
+if [ -z "$CURLWWW" ] ; then
+ CURLWWW=../curl-www
+fi
+
# filter out Author:, Commit: and *by: lines
# cut off the email parts
# split list of names at comma
@@ -47,8 +52,15 @@ fi
# only count names with a space (ie more than one word)
# sort all unique names
# awk them into RELEASE-NOTES format
+
(
-git log --pretty=full --use-mailmap $start..HEAD | \
+ (
+ git log --pretty=full --use-mailmap $start..HEAD
+ if [ -d "$CURLWWW" ]
+ then
+ git -C ../curl-www log --pretty=full --use-mailmap $start..HEAD
+ fi
+ ) | \
egrep -ai '(^Author|^Commit|by):' | \
cut -d: -f2- | \
cut '-d(' -f1 | \
diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh
index da395aebf..44e461455 100755
--- a/scripts/contrithanks.sh
+++ b/scripts/contrithanks.sh
@@ -36,10 +36,23 @@ if test -z "$start"; then
start=`git tag --sort=taggerdate | tail -1`;
fi
+
+# We also include curl-www if possible. Override by setting CURLWWW
+if [ -z "$CURLWWW" ] ; then
+ CURLWWW=../curl-www
+fi
+
cat ./docs/THANKS
(
-git log --use-mailmap $start..HEAD | \
+ (
+ git log --use-mailmap $start..HEAD
+ if [ -d "$CURLWWW" ]
+ then
+ git -C ../curl-www log --use-mailmap $start..HEAD
+ fi
+ ) | \
+
egrep -ai '(^Author|^Commit|by):' | \
cut -d: -f2- | \
cut '-d(' -f1 | \