openstack/nova
Code Issues Proposed changes

[tools] Ignore bot generated patches

Browse Source 
This is a fix for the test whether a patch is bot generated or not, as
that did not worked as intended. The problem is that the script is
checking the email address of the parent patch (HEAD~), which probably
should be right in case the patch would be a MERGE patch. But this is
wrong in case the patch is not a MERGE patch. This fix uses the very
same pattern as it is using for the commit message parsing: the
$commit_hash variable, which is the parent's commit hash if the patch
is a MERGE patch, and an empty string in the other case (causing to
call 'git show' on HEAD).

Change-Id: I0abc72180edf34a6dd0624a40fb8682397805eca
(cherry picked from commit b8f3975d36)
(cherry picked from commit 92b781f96e)
(cherry picked from commit 7a914d6bfc)
(cherry picked from commit 8b79f0f6a4)
This commit is contained in:
Elod Illes
2024-07-12 22:53:06 +02:00
parent 5ba1bd1185
commit fe0eb7ad39
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/check-cherry-picks.sh
View File

@@ -14,7 +14,7 @@ if [ $parent_number -eq 2 ]; then
commit_hash=$(git show --format='%P' --quiet | awk '{print $NF}') commit_hash=$(git show --format='%P' --quiet | awk '{print $NF}')
fi fi
if git show --format='%aE' HEAD~ --quiet | grep -qi 'infra-root@openstack.org'; then if git show --format='%aE' --quiet $commit_hash | grep -qi 'infra-root@openstack.org'; then
echo 'Bot generated change; ignoring' echo 'Bot generated change; ignoring'
exit 0 exit 0
fi fi