e605600d9e
NOTE(elod.illes): This is a combination of 2 commits: the cherry-pick hash checker script and a fix for the script. 1. Check cherry-pick hashes in pep8 tox target This adds a tools/ script that checks any cherry-picked hashes on the current commit (or a provided commit) to make sure that all the hashes exist on at least master or stable/.* branches. This should help avoid accidentally merging stable backports where one of the hashes along the line has changed due to conflicts. 2. Fix cherry-pick check for merge patch Cherry-pick check script validates the proposed patch's commit message. If a patch is not on top of the given branch then Zuul rebases it to the top and the patch becomes a merge patch. In this case the script validates the merge patch's commit message instead of the original patch's commit message and fails. This fix selects the parent of the patch if it is a merge patch. (cherry picked from commit |
||
---|---|---|
.. | ||
db | ||
hooks | ||
xenserver | ||
abandon_old_reviews.sh | ||
build_latex_pdf.sh | ||
check-cherry-picks.sh | ||
flake8wrap.sh | ||
nova-manage.bash_completion | ||
placement_api_docs.py | ||
releasenotes_tox.sh | ||
reserve-migrations.py | ||
test-setup.sh |