chore: do not add merge commits to the change log

pact-foundation · Apr 5, 2023 · 71f1529 · 71f1529
1 parent 9ce2d69
commit 71f1529
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,4 @@
 ### 1.7.0
-  * 9c1132e - Merge pull request #325 from pact-foundation/pactflow_camelcase (Yousaf Nabi, Fri Jan 27 12:29:59 2023 +0000)
   * 44cda33 - chore: /s/Pactflow/PactFlow (Yousaf Nabi, Thu Jan 26 16:11:54 2023 +0000)
   * 1bbdd37 - feat: Enhance provider states for pact-message (#322) (nsfrias, Tue Jan 24 17:04:29 2023 +0000)
   * 53ca129 - chore: add workflow to create a jira issue for pactflow team when smartbear-supported label added to github issue (Beth Skurrie, Wed Jan 18 10:51:05 2023 +1100)

diff --git a/script/release_prep.sh b/script/release_prep.sh
@@ -18,7 +18,8 @@ mv tmp-version pact/__version__.py
 
 echo "Releasing $TAG_NAME"
 
-echo -e "`git log --pretty=format:'  * %h - %s (%an, %ad)' $LAST_TAG..HEAD`\n$(cat CHANGELOG.md)" > CHANGELOG.md
+LOG_ENTRIES="$(git log --pretty=format:'  * %h - %s (%an, %ad)' $LAST_TAG..HEAD | grep -v 'Merge pull request')"
+echo -e "${LOG_ENTRIES}\n$(cat CHANGELOG.md)" > CHANGELOG.md
 echo -e "### $VERSION\n$(cat CHANGELOG.md)" > CHANGELOG.md
 
 echo "Appended Changelog to $VERSION"