Skip to content

Commit ca3616f

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "CI: fix backport validator for new branch naming" into stable/zed
2 parents 3b84421 + abd9a34 commit ca3616f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/check-cherry-picks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke
2323
checked=0
2424
branches+=""
2525
for hash in $hashes; do
26-
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z]+)')
26+
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)')
2727
if [ $? -ne 0 ]; then
2828
echo "Cherry pick hash $hash not on any master or stable branches"
2929
exit 1

0 commit comments

Comments
 (0)