Merge "Follow up for cherry-pick check for merge patch" into stable/queens

This commit is contained in:
Zuul 2020-11-03 08:10:35 +00:00 committed by Gerrit Code Review
commit c719df25e1
1 changed files with 1 additions and 1 deletions

View File

@ -32,7 +32,7 @@ if [ $checked -eq 0 ]; then
echo "Checked $checked cherry-pick hashes: OK" echo "Checked $checked cherry-pick hashes: OK"
exit 0 exit 0
else else
if ! git show --format='%B' --quiet | grep -qi 'stable.*only'; then if ! git show --format='%B' --quiet $commit_hash | grep -qi 'stable.*only'; then
echo 'Stable branch requires either cherry-pick -x headers or [stable-only] tag!' echo 'Stable branch requires either cherry-pick -x headers or [stable-only] tag!'
exit 1 exit 1
fi fi