diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-04-10 21:59:50 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-04-10 21:58:25 +0000 |
| commit | baccdf7b691a0c653e72b7e095896ea271825927 (patch) | |
| tree | 9a89fff7a2ef60e333708b3ad9d4ce0b3e939b8a | |
| parent | Merge pull request #302428 from LeSuisse/pgadin4-CVE-2024-3116-23.11 (diff) | |
| download | nixpkgs-baccdf7b691a0c653e72b7e095896ea271825927.tar.gz | |
check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches
(cherry picked from commit b612366abc32edc61e86d0fcc0f4a08cabcf5212)
| -rwxr-xr-x | maintainers/scripts/check-cherry-picks.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh index 082c33fe088a..6253b97f38d2 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 |