Skip to content

Commit 95e7021

Browse files
committed
Tolerate merge commits in the release notes script
A merge commit has snuck into our history, so we need to tolerate it when running the release notes script :-(.
1 parent 1e9f630 commit 95e7021

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)