diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-30 22:02:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-30 22:02:09 +0000 |
| commit | 5016a36d25de30c78dce3f3a9a247335de286039 (patch) | |
| tree | d3f427e08e0eb80b829145848473c989cdac6963 | |
| parent | 2a26f63bea34580ebe2b915f337cd0b46cbc7ebb (diff) | |
| parent | 115b43ed3e9514d9e4fb41da5582f0b185ecd10a (diff) | |
| download | nova-5016a36d25de30c78dce3f3a9a247335de286039.tar.gz | |
Merge "Follow up for cherry-pick check for merge patch" into stable/train20.4.1
| -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 |