Cherry-pick a patch

In order to test a patch or make additional changes on it, you will need to cherry-pick it from the review system into your local git repository.

  1. Find the review on Gerrit

    see Find a review on Gerrit

  2. Select the latest patchset and click download

    If the recent patchset is not shown, select it first:

    Then click on Download:

  3. Click on copy next to the line for "Cherry pick"

    This copies the command to the clipboard.

  4. Clean up your local repository

    Save your local changes beforehand, if you have any. Otherwise the git reset performed after that would delete local changes, which may happen if you work on different patches simultaneously with the same repository directory.

    git stash save 'comment-your-changes'
    git fetch --all
    git reset --hard origin/main
    git pull --rebase
  5. Execute the command (git cherry-pick)

    In your shell, paste the copied command and execute it. Example:

    git fetch refs/changes/47/56947/11 && git cherry-pick FETCH_HEAD

    Re-apply your local changes, if you had any.

    git stash pop 'comment-your-changes'
  6. Cleanup your TYPO3 installation

    Depending on the changes made by the patch, you may have to apply some changes to your TYPO3 installation as well. Also, if the last time you pulled from the GitHub repository is some time ago, you may need to pull the most recent dependencies. And you may need to rebuild the CSS/JS assets. See Cleanup TYPO3 installation.