Merge pull request #93 from stackhpc/upstream/yoga-2024-08-05

Synchronise yoga with upstream

Author: markgoddard

tools/check-cherry-picks.sh

@@ -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=""
@@ -14,7 +15,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 '[email protected]'; then
+if git show --format='%aE' --quiet $commit_hash | grep -qi '[email protected]'; then
     echo 'Bot generated change; ignoring'
     exit 0
 fi
@@ -23,17 +24,17 @@ 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"
     checked=$(($checked + 1))
 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