ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5259 from ahocevar/squash-changelog

Browse Source 
Include squash commit merges in changelog
This commit is contained in:
Andreas Hocevar
2016-04-22 09:36:46 +02:00
parent 44f09497f0 405ed2af56
commit 60926626df
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tasks/changelog.sh
View File

@@ -11,6 +11,12 @@ set -o errexit
# #
MERGE_RE=Merge\ pull\ request\ #\([0-9]+\)\ from\ \([^/]+\)\/[^\ ]+\ \(.*\) MERGE_RE=Merge\ pull\ request\ #\([0-9]+\)\ from\ \([^/]+\)\/[^\ ]+\ \(.*\)
#
# Regex to match the squash commit message. Creates capture groups for git
# author, commit subject and pull request number.
#
SQUASH_RE='([^\|]+)\|([^\(]+) \(#([0-9]+)\)'
GITHUB_URL=https://github.com GITHUB_URL=https://github.com
PULLS_URL=${GITHUB_URL}/openlayers/ol3/pull PULLS_URL=${GITHUB_URL}/openlayers/ol3/pull
@@ -35,7 +41,7 @@ EOF
# branch (instead only showing merges to master). # branch (instead only showing merges to master).
# #
main() { main() {
git log --first-parent --format='%s %b' ${1} | git log --first-parent --format='%aN|%s %b' ${1} |
{ {
while read l; do while read l; do
if [[ ${l} =~ ${MERGE_RE} ]] ; then if [[ ${l} =~ ${MERGE_RE} ]] ; then
@@ -43,6 +49,11 @@ main() {
author="${BASH_REMATCH[2]}" author="${BASH_REMATCH[2]}"
summary="${BASH_REMATCH[3]}" summary="${BASH_REMATCH[3]}"
echo " * [#${number}](${PULLS_URL}/${number}) - ${summary} ([@${author}](${GITHUB_URL}/${author}))" echo " * [#${number}](${PULLS_URL}/${number}) - ${summary} ([@${author}](${GITHUB_URL}/${author}))"
elif [[ ${l} =~ ${SQUASH_RE} ]] ; then
number="${BASH_REMATCH[3]}"
author="${BASH_REMATCH[1]}"
summary="${BASH_REMATCH[2]}"
echo " * [#${number}](${PULLS_URL}/${number}) - ${summary} ([${author}](${GITHUB_URL}/search?q=${author}&type=Users))"
fi fi
done done
} }