Update kdiff3 install location
PATCH 1/1 Update kdiff3 install location
From: Michael Schindler <[email protected]>
newer versions of kdiff3 for windows install the executable for windows in a /bin subfolder.
This change changes the place where the executable is searched to the new location if not found in %PATH%
fetch a recent windows version from https://download.kde.org/stable/kdiff3/
to see.
---
Update kdiff3
newer versions of kdiff3 for windows install the executable for windows in a bin subfolder. This change changes the place where the executable is searched to the new location if not found in %PATH%
fetch a recent windows version from
https://download.kde.org/stable/kdiff3/ to see.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1376%2Fmichaelcompressconsult%2Fkdiff3_win_moved-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1376/michaelcompressconsult/kdiff3_win_moved-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1376
mergetools/kdiff3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mergetools/kdiff3 +1 -1
@@ -39,6 +39,6 @@ translate_merge_tool_path() { then echo kdiff3 else - mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3" + mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3/bin" fi }
base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164
Signature · 1 line
gitgitgadget
"Michael Schindler via GitGitGadget" <[email protected]>
Quoted 6 lines · writes:
From: Michael Schindler <[email protected]>
newer versions of kdiff3 for windows install the executable for windows in a /bin subfolder.
This change changes the place where the executable is searched to the new location if not found in %PATH%
What happens to those who already have kdiff3 on Windows and haven't upgraded to the ones installed in the /bin subfolder with this change?
mergetools/kdiff3 translate_merge_tool_path() { · line 44
Quoted 12 lines
mergetools/kdiff3 +1
-1@@ -39,6 +39,6 @@ translate_merge_tool_path() { then echo kdiff3 else - mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3" + mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3/bin" fi }
Will they lose the access to kdiff3 backend when they upgrade their Git to a version that includes this change, or is the old location expected to be on %PATH%? I find the latter unlikely---the original would not have bothered to use mergetool_find_win32_cmd if that were the case.
I am wondering if mergetool_find_win32_cmd should take multiple candidate directories, not just a single directory, so that users of old and new versions are both kept happy.
Thanks.