about summary refs log tree commit diff
path: root/maintainers/scripts
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2024-04-10 21:59:50 +0100
committerRobert Scott <code@humanleg.org.uk>2024-04-10 21:59:50 +0100
commitb612366abc32edc61e86d0fcc0f4a08cabcf5212 (patch)
tree34fa99f7750ee40f48cc75a4380c9812eb180fb8 /maintainers/scripts
parentddcd5f27629170e0f2d408a52ed6e90727f74de1 (diff)
check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches
Diffstat (limited to 'maintainers/scripts')
-rwxr-xr-xmaintainers/scripts/check-cherry-picks.sh3
1 files changed, 3 insertions, 0 deletions
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