Merge "[tools] Ignore bot generated patches" into unmaintained/zed

Zuul · openstack-gerrit · commit f17e23e833b2 · 2024-08-01T12:21:34.000Z
diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh
@@ -14,7 +14,7 @@ if [ $parent_number -eq 2 ]; then
     commit_hash=$(git show --format='%P' --quiet | awk '{print $NF}')
 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'
     exit 0
 fi

-Original file line number
+Diff line change
     commit_hash=$(git show --format='%P' --quiet | awk '{print $NF}')
 fi
 -if git show --format='%aE' HEAD~ --quiet | grep -qi '[email protected]'; then
 +if git show --format='%aE' --quiet $commit_hash | grep -qi '[email protected]'; then
     echo 'Bot generated change; ignoring'
     exit 0
 fi