[tools] Backport validator: handle unmaintained

When the script was created there were only stable/* branches, but now
there are unmaintained/* branches as well, where the validator fails
when looking for hashes only on stable/* branches even if the given
hash is already on unmtaintained/* branch. This patch matches now both
stable/* and unmaintained/* branches.

Change-Id: I08fcc63ab0fbe5af1be70d5fde5af98bf006101c
(cherry picked from commit e2697de8e41a566eb86aefa364906bda9bc59863)
(cherry picked from commit 602e68364c54fb54140006f38d6995b9a5b354a9)
(cherry picked from commit 56e73cc7bad51435a79584e9411f07add0d0536a)
(cherry picked from commit f53824f95bea8769a2b28c62f23e57cb8dbafae5)
(cherry picked from commit f43ceef5769f1bfbeddf062f3fd745fc3c519ace)
This commit is contained in:
Elod Illes 2024-07-12 23:10:26 +02:00
parent 4d2b894e77
commit 7b7bac3e21

View File

@ -1,7 +1,8 @@
#!/bin/sh
#
# A tool to check the cherry-pick hashes from the current git commit message
# to verify that they're all on either master or stable/ branches
# to verify that they're all on either master, stable/ or unmaintained/
# branches
#
commit_hash=""
@ -23,9 +24,9 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke
checked=0
branches+=""
for hash in $hashes; do
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)')
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+|unmaintained/[a-z0-9.]+)')
if [ $? -ne 0 ]; then
echo "Cherry pick hash $hash not on any master or stable branches"
echo "Cherry pick hash $hash not on any master, stable or unmaintained branches"
exit 1
fi
branches+=" $branch"
@ -33,7 +34,7 @@ for hash in $hashes; do
done
if [ $checked -eq 0 ]; then
if ! grep -q '^defaultbranch=stable/' .gitreview; then
if ! grep -qE '^defaultbranch=(stable|unmaintained)/' .gitreview; then
echo "Checked $checked cherry-pick hashes: OK"
exit 0
else