| name | cherry-pick |
| description | Cherry-pick a commit from origin/main into a release branch using a temporary git worktree |
| disable-model-invocation | true |
| allowed-tools | Bash(git fetch *), Bash(git log *), Bash(git branch *), Bash(git worktree *), Bash(git cherry-pick *), Bash(git -C * status), Bash(git -C * cherry-pick *), Bash(git -C * checkout *), Bash(git -C * push *), Bash(git -C * branch *), Bash(git push *), Bash(git commit *), Bash(git checkout *), Bash(mktemp *), Bash(make *), Bash(gh pr create *), Bash(gh api *), AskUserQuestion |
Cherry-Pick to Release Branch
Cherry-pick a commit from origin/main into a release branch using a temporary git worktree.
Resume Check
Before starting, check if there is an existing cherry-pick worktree from a previous run:
git worktree list | grep cherry-pick/
If there is a worktree on a cherry-pick/* branch, a previous cherry-pick may have stopped due to conflicts. Ask the user if they want to resume it. If yes:
- Set
WORKTREE_DIR to the existing worktree path.
- Check the cherry-pick state:
git -C "$WORKTREE_DIR" status
- If the cherry-pick is still in progress (conflicts resolved, staged), run
git -C "$WORKTREE_DIR" cherry-pick --continue to finalize.
- If the working tree is clean (cherry-pick already completed), proceed to push.
- Recover the original source commit SHA from the worktree's branch name (it's encoded as
cherry-pick/<source-sha>-to-<release-branch>):
BRANCH=$(git -C "$WORKTREE_DIR" branch --show-current)
SOURCE_SHA=${BRANCH#cherry-pick/}
SOURCE_SHA=${SOURCE_SHA%-to-*}
Do NOT use the worktree's HEAD SHA — that's the new cherry-pick commit, not the original. Then run step 4 with $SOURCE_SHA to gather the original PR metadata.
- Continue from step 10 (push) onward.
If the user does not want to resume, clean up the stale worktree first, then start fresh.
Steps
-
Fetch latest from origin:
git fetch origin
-
Show recent commits on origin/main:
Run git log origin/main --oneline -20 to get the list.
-
Ask the user which commit to cherry-pick:
Use AskUserQuestion to present the recent commits as options. Let the user select one.
-
Look up the original PR for the selected commit:
gh pr view does not accept a commit SHA, so query the commits→pulls API directly:
gh api repos/ai-dynamo/aiperf/commits/<source-commit-sha>/pulls \
--jq '.[0] | "\(.number)\t\(.title)"'
Save the PR number and title for use in steps 11 and 13. If the commit message contains a PR number (e.g. (#669)), you can also use that directly.
-
Find all release branches:
Run git branch -r --list 'origin/release/*' to get all remote release branches matching release/X.X.X.
-
Ask the user which release branch to target:
Use AskUserQuestion to present the release branches as options. The most recent version (highest semver) should be the first option marked as "(Recommended)".
-
Create a temporary worktree on a feature branch:
Release branches are protected, so work on a cherry-pick/ feature branch from the start.
This also makes the worktree identifiable for resume if conflicts occur.
WORKTREE_DIR=$(mktemp -d)
git worktree add "$WORKTREE_DIR" origin/<release-branch>
git -C "$WORKTREE_DIR" checkout -b cherry-pick/<commit-hash>-to-<release-branch>
-
Set up the environment in the worktree (required for pre-commit hooks):
make -C "$WORKTREE_DIR" first-time-setup
-
Cherry-pick the commit:
git -C "$WORKTREE_DIR" cherry-pick <commit-hash>
Rules
- NEVER add a
Co-Authored-By line
- NEVER manually add a
Signed-off-by line — git commit -s handles this automatically
- If the cherry-pick results in a new commit (e.g. conflict resolution), use
git commit -s with a HEREDOC message
- NEVER use
--no-verify
- NEVER force push
- NEVER use
git stash, git reset, git revert, git checkout -- <file>, git restore, or git clean
- Always clean up the worktree after a successful push or if the user abandons the cherry-pick
- On cherry-pick conflicts: do NOT clean up the worktree — leave it for the user to resolve, then resume
- If anything else fails, clean up the worktree and report the error to the user
