{"thread":{"id":"58581","subject":"[PATCH] Update kdiff3 install location","startedAt":"2022-10-07T11:17:35Z","lastAt":"2022-10-07T17:03:45Z","messageCount":2,"participants":["Michael Schindler via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"464370","messageId":"pull.1376.git.1665141449621.gitgitgadget@gmail.com","threadId":"58581","inReplyTo":null,"subject":"[PATCH] Update kdiff3 install location","fromName":"Michael Schindler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-10-07T11:17:29Z","receivedAt":"2022-10-07T11:17:35Z","isPatch":true,"sender":{"key":"name:Michael Schindler","avatar":null},"body":"From: Michael Schindler <michael@compressconsult.com>\n\nnewer versions of kdiff3 for windows install the executable for windows\nin a /bin subfolder.\nThis change changes the place where the executable is searched to the new\nlocation if not found in %PATH%\n\nfetch a recent windows version from https://download.kde.org/stable/kdiff3/\nto see.\n\nSigned-off-by: Michael Schindler <michael.schindler@allianz.at>\n---\n    Update kdiff3\n    \n    newer versions of kdiff3 for windows install the executable for windows\n    in a bin subfolder. This change changes the place where the executable\n    is searched to the new location if not found in %PATH%\n    \n    fetch a recent windows version from\n    https://download.kde.org/stable/kdiff3/ to see.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1376%2Fmichaelcompressconsult%2Fkdiff3_win_moved-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1376/michaelcompressconsult/kdiff3_win_moved-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1376\n\n mergetools/kdiff3 | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/mergetools/kdiff3 b/mergetools/kdiff3\nindex ee8b3a0570e..c26a9573815 100644\n--- a/mergetools/kdiff3\n+++ b/mergetools/kdiff3\n@@ -39,6 +39,6 @@ translate_merge_tool_path() {\n \tthen\n \t\techo kdiff3\n \telse\n-\t\tmergetool_find_win32_cmd \"kdiff3.exe\" \"Kdiff3\"\n+\t\tmergetool_find_win32_cmd \"kdiff3.exe\" \"Kdiff3/bin\"\n \tfi\n }\n\nbase-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164\n-- \ngitgitgadget\n"},{"id":"464384","messageId":"xmqqedvjh8ic.fsf@gitster.g","threadId":"58581","inReplyTo":"pull.1376.git.1665141449621.gitgitgadget@gmail.com","subject":"Re: [PATCH] Update kdiff3 install location","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-10-07T17:02:35Z","receivedAt":"2022-10-07T17:03:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Michael Schindler via GitGitGadget\" <gitgitgadget@gmail.com>\nwrites:\n\n> From: Michael Schindler <michael@compressconsult.com>\n>\n> newer versions of kdiff3 for windows install the executable for windows\n> in a /bin subfolder.\n> This change changes the place where the executable is searched to the new\n> location if not found in %PATH%\n\nWhat happens to those who already have kdiff3 on Windows and haven't\nupgraded to the ones installed in the /bin subfolder with this\nchange?\n\n> diff --git a/mergetools/kdiff3 b/mergetools/kdiff3\n> index ee8b3a0570e..c26a9573815 100644\n> --- a/mergetools/kdiff3\n> +++ b/mergetools/kdiff3\n> @@ -39,6 +39,6 @@ translate_merge_tool_path() {\n>  \tthen\n>  \t\techo kdiff3\n>  \telse\n> -\t\tmergetool_find_win32_cmd \"kdiff3.exe\" \"Kdiff3\"\n> +\t\tmergetool_find_win32_cmd \"kdiff3.exe\" \"Kdiff3/bin\"\n>  \tfi\n>  }\n\nWill they lose the access to kdiff3 backend when they upgrade their\nGit to a version that includes this change, or is the old location\nexpected to be on %PATH%?  I find the latter unlikely---the original\nwould not have bothered to use mergetool_find_win32_cmd if that were\nthe case.\n\nI am wondering if mergetool_find_win32_cmd should take multiple\ncandidate directories, not just a single directory, so that users of\nold and new versions are both kept happy.\n\nThanks.\n"}]}