Skip to content

Commit 2ea8546

Browse files
committed
Tolerate (more) merge commits in release notes
PR kubernetes-sigs#767 introduces some weird merge commit styles into the git history by default, so now we have to tolerate them in our release notes script.
1 parent 3ce25e2 commit 2ea8546

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

hack/release/release-notes.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ while read commit_word commit; do
3030
# skip temporary merge commits and accidental merge commit inclusion
3131
# for calcuating release notes.
3232
continue
33+
elif [[ ${title} == "Merge branch '"*"'"* ]]; then
34+
# skip for accidental merge commit inclusion for calculating release notes
35+
# NB(directxman12): it's not clear what tool generates this style, but we've
36+
# got some now, so tolerate them.
37+
continue
3338
fi
3439

3540
read # skip the blank line

0 commit comments

Comments
 (0)