Skip to content

🏃 Make the release notes script tolerant of merges #604

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
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
9 changes: 9 additions & 0 deletions hack/release/release-notes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,16 @@ NEWLINE="
"
head_commit=$(git rev-parse HEAD)
while read commit_word commit; do
if [[ -z ${commit_word} ]]; then
# skip terminating blank lines
continue
fi
read title
if [[ ${title} == "Merge branch '"*"' into release-"* ]]; then
# skip temporary merge commits for calculating release notes
continue
fi

read # skip the blank line
read prefix body

Expand Down