diff options
| author | melanie witt <melwittt@gmail.com> | 2020-10-08 05:45:24 +0000 |
|---|---|---|
| committer | melanie witt <melwittt@gmail.com> | 2020-11-02 20:48:04 +0000 |
| commit | 70cbd1535a62a2323726b84229b78d0b1d09d710 (patch) | |
| tree | 38e5bc52e1d2593a52fadd4f23a52b7bcc042941 | |
| parent | 9167558dfa8fc706c3d93727d6d5f6faf229b17c (diff) | |
| download | nova-70cbd1535a62a2323726b84229b78d0b1d09d710.tar.gz | |
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 1e10461c71cb78226824988b8c903448ba7a8a76)
(cherry picked from commit f1e4f6b078baf72e83cd7341c380aa0fc511519e)
(cherry picked from commit e676a480544b3fa71fcaa984a658e2131b7538c5)
(cherry picked from commit 115b43ed3e9514d9e4fb41da5582f0b185ecd10a)
(cherry picked from commit cde42879a497cd2b91f0cf926e0417fda07b3c31)
(cherry picked from commit 3c774435502a339f202e94ae15d637e49a19d4ce)
| -rwxr-xr-x | tools/check-cherry-picks.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh index 32627e59b6..5a449c520b 100755 --- a/tools/check-cherry-picks.sh +++ b/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 |