Skip to content

Commit 4622064

Browse files
authored
Merge pull request #159 from stackhpc/upstream/wallaby-2025-10-13
Synchronise wallaby with upstream
2 parents 20b64ed + c1496c4 commit 4622064

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tools/check-cherry-picks.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ branches+=""
2121
for hash in $hashes; do
2222
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+|unmaintained/[a-z0-9.]+)')
2323
if [ $? -ne 0 ]; then
24-
echo "Cherry pick hash $hash not on any master, stable or unmaintained branches"
25-
exit 1
24+
branch=$(git tag --contains "$hash" 2>/dev/null| grep -oE '([0-9.]+-eol)')
25+
if [ $? -ne 0 ]; then
26+
echo "Cherry pick hash $hash not on any master, stable, unmaintained or EOL'd branches"
27+
exit 1
28+
fi
2629
fi
2730
branches+=" $branch"
2831
checked=$(($checked + 1))

0 commit comments

Comments
 (0)