-
Couldn't load subscription status.
- Fork 62
Add git-cherry-pick-by-patch command #50
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
openshift-merge-bot
merged 1 commit into
openshift-eng:main
from
mpatlasov:add-git-cherry-pick
Oct 24, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| --- | ||
| argument-hint: <commit_hash> | ||
| description: Cherry-pick git commit into current branch by "patch" command | ||
| --- | ||
|
|
||
| ## Name | ||
| git:cherry-pick-by-patch | ||
|
|
||
| ## Synopsis | ||
| ``` | ||
| /git:cherry-pick-by-patch commit_hash | ||
| ``` | ||
|
|
||
| ## Description | ||
|
|
||
| The `/git-cherry-pick-by-patch commit_hash` command cherry-picks commit with hash | ||
| `commit_hash` into current branch. Rather then doing `git cherry-pick commit_hash`, | ||
| the command streams the output of `git show commit_hash` to | ||
| `patch -p1 --no-backup-if-mismatch`, and then commit changes with commit message | ||
| from `commit_hash` commit. | ||
|
|
||
| ## Workflow | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We are calling this ##Implementation by convention where workflow could be ### |
||
|
|
||
| ### Pre-requisites | ||
mpatlasov marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| The commit with hash `commit_hash` must exist. To verify that use: | ||
| ```bash | ||
| git show commit_hash | ||
| ``` | ||
| and check if exit code is zero. | ||
|
|
||
| Fail, if there is no `commit_hash` in the current repository checkout. | ||
|
|
||
| ### Cherry-pick `commit_hash` into current branch | ||
|
|
||
| 1. Execute command | ||
| ```bash | ||
| git show commit_hash | patch -p1 --no-backup-if-mismatch | ||
| ``` | ||
| and check if exit code is zero. Fail if exit code is not zero. | ||
|
|
||
| 2. Find files removed from local checkout by the patch command and execute `git rm` for them. | ||
|
|
||
| 3. Find files added or modified by the patch command and execute `git add` for them. | ||
|
|
||
| 4. Commit changes by `git commit` command and use commit title and description from `commit_hash` commit. | ||
|
|
||
| ## Arguments | ||
|
|
||
| - **$1** (required): Commit hash (e.g., `902409c0`) of commit to cherry-pick. | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.