Skip to content

Commit befb89e

Browse files
authored
Merge pull request #634 from DirectXMan12/infra/tolerate-merge-commits
🏃 Tolerate merge commits in the release notes script
2 parents 1e9f630 + 95e7021 commit befb89e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

hack/release/release-notes.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ while read commit_word commit; do
2626
continue
2727
fi
2828
read title
29-
if [[ ${title} == "Merge branch '"*"' into release-"* ]]; then
30-
# skip temporary merge commits for calculating release notes
29+
if [[ ${title} == "Merge branch '"*"' into"* ]]; then
30+
# skip temporary merge commits and accidental merge commit inclusion
31+
# for calcuating release notes.
3132
continue
3233
fi
3334

0 commit comments

Comments
 (0)