{"thread":{"id":"55586","subject":"[PATCH] mergetool: add win32 path translation for diffmerge","startedAt":"2021-04-29T11:40:06Z","lastAt":"2021-05-03T05:49:54Z","messageCount":2,"participants":["Bert Huijben via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"423261","messageId":"pull.1014.git.git.1619696399147.gitgitgadget@gmail.com","threadId":"55586","inReplyTo":null,"subject":"[PATCH] mergetool: add win32 path translation for diffmerge","fromName":"Bert Huijben via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-04-29T11:39:58Z","receivedAt":"2021-04-29T11:40:06Z","isPatch":true,"sender":{"key":"bert@qqmail.nl","avatar":"https://gravatar.com/avatar/3eb6d66fbca2e83b0c493dce9c96e6cc40e2d7983403900ac34453dfcc80bc05?d=mp&s=160"},"body":"From: Bert Huijben <bert@vmoo.com>\n\nUse the infrastructure added for finding winmerge to also\nautomatically find DiffMerge,\n\nSigned-off-by: Bert Huijben <bert@vmoo.com>\n---\n    mergetool: Add win32 path translation for DiffMerge\n    \n    Re-use the path translation added for winmerge to automatically find\n    SouceGear DiffMerge on Windows.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1014%2Frhuijben%2Ffix%2Fdiffmerge-path-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1014/rhuijben/fix/diffmerge-path-v1\nPull-Request: https://github.com/git/git/pull/1014\n\n mergetools/diffmerge | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/mergetools/diffmerge b/mergetools/diffmerge\nindex 9b6355b98a71..458ed9a89718 100644\n--- a/mergetools/diffmerge\n+++ b/mergetools/diffmerge\n@@ -16,3 +16,7 @@ merge_cmd () {\n exit_code_trustable () {\n \ttrue\n }\n+\n+translate_merge_tool_path() {\n+\tmergetool_find_win32_cmd \"sgdm.exe\" \"SourceGear/Common/DiffMerge\"\n+}\n\nbase-commit: b0c09ab8796fb736efa432b8e817334f3e5ee75a\n-- \ngitgitgadget\n"},{"id":"423468","messageId":"xmqqbl9s8iyo.fsf@gitster.g","threadId":"55586","inReplyTo":"pull.1014.git.git.1619696399147.gitgitgadget@gmail.com","subject":"Re: [PATCH] mergetool: add win32 path translation for diffmerge","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-05-03T05:49:51Z","receivedAt":"2021-05-03T05:49:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Bert Huijben via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Bert Huijben <bert@vmoo.com>\n>\n> Use the infrastructure added for finding winmerge to also\n> automatically find DiffMerge,\n> ...\n> diff --git a/mergetools/diffmerge b/mergetools/diffmerge\n> index 9b6355b98a71..458ed9a89718 100644\n> --- a/mergetools/diffmerge\n> +++ b/mergetools/diffmerge\n> @@ -16,3 +16,7 @@ merge_cmd () {\n>  exit_code_trustable () {\n>  \ttrue\n>  }\n> +\n> +translate_merge_tool_path() {\n> +\tmergetool_find_win32_cmd \"sgdm.exe\" \"SourceGear/Common/DiffMerge\"\n> +}\n\nc5f424fd (mergetools/diffmerge: support DiffMerge as a git\nmergetool, 2013-10-13) explains that\n\n    mergetools/diffmerge: support DiffMerge as a git mergetool\n    \n    DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux.\n    \n        See http://www.sourcegear.com/diffmerge/\n    \n    DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the\n    graphical compare tool.\n\nNow, I would assume sgdm.exe would be something users of Windows\nversion of the tool may be familiar with, but how would the proposed\nchange affect users of the tool on other platforms?\n"}]}