From 20a0867d7fa7372aabdd958d4f587bb0f48c07cd Mon Sep 17 00:00:00 2001 From: weizhoublue <45163302+weizhoublue@users.noreply.github.com> Date: Tue, 26 Sep 2023 23:38:12 +0800 Subject: [PATCH] Update auto-cherrypick.yaml --- .github/workflows/auto-cherrypick.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-cherrypick.yaml b/.github/workflows/auto-cherrypick.yaml index 4cb45bbf9e..e2d4ba8b00 100644 --- a/.github/workflows/auto-cherrypick.yaml +++ b/.github/workflows/auto-cherrypick.yaml @@ -148,7 +148,7 @@ jobs: UPDATE=false ERROR_MESSAGE="" for COMMIT in $PR_COMMITS; do - if ! ERROR_MESSAGE=`git cherry-pick $COMMIT 2>&1` ; then + if ! ERROR_MESSAGE=`git cherry-pick -m 1 $COMMIT 2>&1` ; then echo ">>>>>>>>>>>> fail when cherry pick $COMMIT to branch $BRANCH " echo "$ERROR_MESSAGE" echo "---- failuire detail"