Merge pull request #864 from DirectXMan12/infra/tolerate-extra-rel-no…

…tes-merges 🏃 Tolerate (more) merge commits in release notes
kubernetes-sigs · Mar 18, 2020 · 29e923a · 29e923a
2 parents 3ce25e2 + 2ea8546
commit 29e923a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/hack/release/release-notes.sh b/hack/release/release-notes.sh
@@ -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