From b612366abc32edc61e86d0fcc0f4a08cabcf5212 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 10 Apr 2024 21:59:50 +0100 Subject: check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches --- maintainers/scripts/check-cherry-picks.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh index 082c33fe088a0..6253b97f38d26 100755 --- a/maintainers/scripts/check-cherry-picks.sh +++ b/maintainers/scripts/check-cherry-picks.sh @@ -12,6 +12,9 @@ PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.? problem=0 while read new_commit_sha ; do + if [ -z "$new_commit_sha" ] ; then + continue # skip empty lines + fi if [ "$GITHUB_ACTIONS" = 'true' ] ; then echo "::group::Commit $new_commit_sha" else -- cgit 1.4.1