Skip to content
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

Remove unnecessary call_user_func wrapping in TCA override example #4765

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

dogawaf
Copy link
Contributor

@dogawaf dogawaf commented Sep 16, 2024

Follow up of #4757

@linawolf linawolf self-assigned this Sep 17, 2024
@linawolf linawolf added the backport 12.4 Backport to TYPO3v12 label Sep 17, 2024
Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for applying the changes here as well!

@linawolf linawolf merged commit c5f7d08 into TYPO3-Documentation:main Sep 17, 2024
6 checks passed
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5c8a1efd8... [TASK] Remove unnecessary call_user_func wrapping in TCA override example
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging Documentation/ApiOverview/ContentElements/AddingYourOwnContentElements.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/ContentElements/AddingYourOwnContentElements.rst
Auto-merging Documentation/ApiOverview/ContentElements/_AddingYourOwnContentElements/_tt_content.php
CONFLICT (content): Merge conflict in Documentation/ApiOverview/ContentElements/_AddingYourOwnContentElements/_tt_content.php

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-4765-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5c8a1efd86a2d3268ec5307b0b61953c4e867521
# Push it to GitHub
git push --set-upstream origin backport-4765-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-4765-to-12.4.

@linawolf
Copy link
Member

Was not used in TYPo3 v12

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants