Browse Source

Follow up for cherry-pick check for merge patch

This is a follow up to change
I8e4e5afc773d53dee9c1c24951bb07a45ddc2f1a which fixed an issue with
validation when the topmost patch after a Zuul rebase is a merge
patch.

We need to also use the $commit_hash variable for the check for
stable-only patches, else it will incorrectly fail because it is
checking the merge patch's commit message.

Change-Id: Ia725346b65dd5e2f16aa049c74b45d99e22b3524
(cherry picked from commit 1e10461c71)
(cherry picked from commit f1e4f6b078)
(cherry picked from commit e676a48054)
(cherry picked from commit 115b43ed3e)
(cherry picked from commit cde42879a4)
changes/00/761000/1
melanie witt 1 year ago
parent
commit
3c77443550
  1. 2
      tools/check-cherry-picks.sh

2
tools/check-cherry-picks.sh

@ -32,7 +32,7 @@ if [ $checked -eq 0 ]; then
echo "Checked $checked cherry-pick hashes: OK"
exit 0
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!'
exit 1
fi

Loading…
Cancel
Save