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. Change-Id: I8e4e5afc773d53dee9c1c24951bb07a45ddc2f1a (cherry picked from commitc7c48c6f52
) (cherry picked from commit02f213b831
)
This commit is contained in:
parent
d307b964ce
commit
7a5111ba29
|
@ -4,7 +4,17 @@
|
||||||
# to verify that they're all on either master or stable/ branches
|
# to verify that they're all on either master or stable/ branches
|
||||||
#
|
#
|
||||||
|
|
||||||
hashes=$(git show --format='%b' --quiet $1 | sed -nr 's/^.cherry picked from commit (.*).$/\1/p')
|
commit_hash=""
|
||||||
|
|
||||||
|
# Check if the patch is a merge patch by counting the number of parents.
|
||||||
|
# If the patch has 2 parents, then the 2nd parent is the patch we want
|
||||||
|
# to validate.
|
||||||
|
parent_number=$(git show --format='%P' --quiet | awk '{print NF}')
|
||||||
|
if [ $parent_number -eq 2 ]; then
|
||||||
|
commit_hash=$(git show --format='%P' --quiet | awk '{print $NF}')
|
||||||
|
fi
|
||||||
|
|
||||||
|
hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picked from commit (.*).$/\1/p')
|
||||||
checked=0
|
checked=0
|
||||||
branches+=""
|
branches+=""
|
||||||
for hash in $hashes; do
|
for hash in $hashes; do
|
||||||
|
|
Loading…
Reference in New Issue