cli: don't ignore diff --tool=:builtin, report error
#3166
Merged
Conversation
This file contains 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
I'm going to split get_tool_config() to fix "diff --tool=:builtin", and it doesn't make sense to duplicate get_tool_config_from_args() per backing get_tool_config() functions.
The :builtin tool only applies to merge or diff editor.
Before, --tool=:builtin argument was ignored and the tool was loaded from "ui.diff.tool" option. Since there is no single builtin diff format, :builtin doesn't make sense here. Maybe we can translate ":<format>" to the internal diff format instead, but that will also mean "ui.diff.tool" and ".format" can be merged. This partially reverts 409356f "merge_tools: enable `:builtin` as default diff/merge editor."
yuja
force-pushed
the
push-uysztopmrkwm
branch
from
62589c6 to
96ccb87
Compare
martinvonz
approved these changes
Feb 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist
If applicable:
CHANGELOG.md