Skip to content

🏃 Tolerate (more) merge commits in release notes #864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions hack/release/release-notes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ while read commit_word commit; do
# skip temporary merge commits and accidental merge commit inclusion
# for calcuating release notes.
continue
elif [[ ${title} == "Merge branch '"*"'"* ]]; then
# skip for accidental merge commit inclusion for calculating release notes
# NB(directxman12): it's not clear what tool generates this style, but we've
# got some now, so tolerate them.
continue
fi

read # skip the blank line
Expand Down