-
Notifications
You must be signed in to change notification settings - Fork 26.4k
use get_merge_tool_path() also in is_available() to honor settings #1032
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
base: master
Are you sure you want to change the base?
use get_merge_tool_path() also in is_available() to honor settings #1032
Conversation
There is an issue in commit 8ad074a: |
fix the is_available test used in git mergetool --tool-help or git difftool --tool-help or to check the list of tools available when no tool is configured/given with --tool symtoms: the actual tool running run_merge_tool () considers the difftool. "$merge_tool".path and mergetool."$merge_tool".path and if configured honors these. See get_merge_tool_path () in git-mergetool--lib.sh If not set use fallback: translate_merge_tool_path "$merge_tool". The is_available () just uses translate_merge_tool_path "$merge_tool". repo 1: Configure an invalid path in mergetool."$merge_tool".path for a tool of your choice. You will be informed that the tool is available, but when trying to use it will not be found because the invalid configured path is used. repo2: Install a tool of your choice on a nonstandard place (e.g. rename the program) and configure mergetool."$merge_tool".path for this tool. You will be informed that the tool is not available (because not found on standard place), but when trying to run it will work. This fix will make the information consistent by using get_merge_tool_path() also in is_available() Signed-off-by: Michael Schindler <michael@compressconsult.com>
8ad074a
to
1a715cc
Compare
/submit |
Submitted as pull.1032.git.git.1623098845733.gitgitgadget@gmail.com To fetch this version into
To fetch this version to local tag
|
On the Git mailing list, Junio C Hamano wrote (reply to this):
|
On the Git mailing list, David Aguilar wrote (reply to this):
|
User |
On the Git mailing list, Adam Dinwoodie wrote (reply to this):
|
User |
Newer windows versions of kdiff3 have kdiff3 in a bin folder. This fix allows finding them. Note that currently finding the tool cannot be configured unless you have write access to the changed file, since configuration is not honored See for cause and fix git#1032
fix the is_available() used in git mergetool --tool-help or git difftool --tool-help or used to check the list of tools available when no tool is configured/given with --tool
symtoms: the actual tool running run_merge_tool () considers the difftool."$merge_tool".path and mergetool."$merge_tool".path and if configured honors these. See get_merge_tool_path () in git-mergetool--lib.sh
If not defined use fallback: translate_merge_tool_path "$merge_tool".
The is_available () just uses translate_merge_tool_path "$merge_tool".
repo 1: Configure an invalid path in mergetool."$merge_tool".path for a tool of your choice.
You will be informed that the tool is available, but when trying to use it it will not be found because the invalid configured path is used.
repo2: Install a tool of your choice on a nonstandard place (e.g. rename the program) and configure mergetool."$merge_tool".path for this tool.
You will be informed that the tool is not available (because not found on standard place), but when trying to run it will work.
This fix will make the information consistent by using get_merge_tool_path() also in is_available()
Signed-off-by: Michael Schindler michael@compressconsult.com
cc: David Aguilar davvid@gmail.com
cc: Adam Dinwoodie adam@dinwoodie.org