From ef86fd1c94847184f33c649307dc25e8226b20e2 Mon Sep 17 00:00:00 2001
From: YuBaoku <49938469+EmmonsCurse@users.noreply.github.com>
Date: Wed, 22 Apr 2026 22:48:00 +0800
Subject: [PATCH 1/2] Revert "[CI] Update cherry-pick.yml"

---
 .github/workflows/cherry-pick.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cherry-pick.yml b/.github/workflows/cherry-pick.yml
index 261be45c1fe..c6e1bad992e 100644
--- a/.github/workflows/cherry-pick.yml
+++ b/.github/workflows/cherry-pick.yml
@@ -106,24 +106,15 @@ jobs:
               git fetch origin "$TARGET_BRANCH"
               git checkout -b "$NEW_BRANCH" "origin/$TARGET_BRANCH"
 
-              # If PR_TITLE starts with "[", don't insert an extra space.
-              if [ "${PR_TITLE:0:1}" = "[" ]; then
-                NEW_TITLE="[Cherry-Pick]$PR_TITLE(#$PR_NUMBER)"
-              else
-                NEW_TITLE="[Cherry-Pick] $PR_TITLE(#$PR_NUMBER)"
-              fi
-
               # Cherry pick
               # Try standard cherry-pick first (for squash merges or single commits)
               if git cherry-pick "$MERGE_COMMIT_SHA"; then
                 echo "Cherry-pick successful."
-                git commit --amend -m "$NEW_TITLE"
               else
                 echo "Standard cherry-pick failed, trying with -m 1 (for merge commits)..."
                 git cherry-pick --abort
                 if git cherry-pick -m 1 "$MERGE_COMMIT_SHA"; then
                   echo "Cherry-pick with -m 1 successful."
-                  git commit --amend -m "$NEW_TITLE"
                 else
                   echo "Cherry-pick failed."
                   git cherry-pick --abort
@@ -144,6 +135,13 @@ jobs:
               git push "$FORK_URL_AUTH" "$NEW_BRANCH" --force
 
               # Create PR
+              # If PR_TITLE starts with "[", don't insert an extra space.
+              if [ "${PR_TITLE:0:1}" = "[" ]; then
+                NEW_TITLE="[Cherry-Pick]$PR_TITLE(#$PR_NUMBER)"
+              else
+                NEW_TITLE="[Cherry-Pick] $PR_TITLE(#$PR_NUMBER)"
+              fi
+
               NEW_BODY="Cherry-pick of #$PR_NUMBER (authored by @${PR_AUTHOR}) to \`$TARGET_BRANCH\`.
 
               devPR:https://github.com/PaddlePaddle/FastDeploy/pull/$PR_NUMBER <!-- For pass CI -->

From 71fef25927b939682ee9c9378fca539f1b90e9d9 Mon Sep 17 00:00:00 2001
From: YuBaoku <49938469+EmmonsCurse@users.noreply.github.com>
Date: Wed, 22 Apr 2026 22:49:29 +0800
Subject: [PATCH 2/2] Update cherry-pick.yml

---
 .github/workflows/cherry-pick.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cherry-pick.yml b/.github/workflows/cherry-pick.yml
index c6e1bad992e..c7853e1e747 100644
--- a/.github/workflows/cherry-pick.yml
+++ b/.github/workflows/cherry-pick.yml
@@ -134,7 +134,7 @@ jobs:
               echo "Pushing to fork..."
               git push "$FORK_URL_AUTH" "$NEW_BRANCH" --force
 
-              # Create PR
+              # Create PR DEBUG
               # If PR_TITLE starts with "[", don't insert an extra space.
               if [ "${PR_TITLE:0:1}" = "[" ]; then
                 NEW_TITLE="[Cherry-Pick]$PR_TITLE(#$PR_NUMBER)"