threads / patch / 55586

patchmergetool: add win32 path translation for diffmerge

Subject: [PATCH] mergetool: add win32 path translation for diffmerge

## tl;dr

2 messages between Apr 29, 2021 and May 3, 2021. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Bert Huijben via GitGitGadget· Apr 29, 2021, 11:39 UTC · lore
From: Bert Huijben <bert@vmoo.com>

Use the infrastructure added for finding winmerge to also automatically find DiffMerge,

Signed-off-by: Bert Huijben <bert@vmoo.com>
---
    mergetool: Add win32 path translation for DiffMerge
    
    Re-use the path translation added for winmerge to automatically find
    SouceGear DiffMerge on Windows.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1014%2Frhuijben%2Ffix%2Fdiffmerge-path-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1014/rhuijben/fix/diffmerge-path-v1
Pull-Request: https://github.com/git/git/pull/1014
 mergetools/diffmerge | 4 ++++
 1 file changed, 4 insertions(+)
Show changes to mergetools/diffmerge +4 −0
diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 9b6355b98a71..458ed9a89718 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -16,3 +16,7 @@ merge_cmd () {
 exit_code_trustable () {
 	true
 }
+
+translate_merge_tool_path() {
+	mergetool_find_win32_cmd "sgdm.exe" "SourceGear/Common/DiffMerge"
+}

base-commit: b0c09ab8796fb736efa432b8e817334f3e5ee75a

-- 
gitgitgadget
Junio C Hamano· May 3, 2021, 05:49 UTC · re: Bert Huijben via GitGitGadget · lore

Re: [PATCH] mergetool: add win32 path translation for diffmerge

"Bert Huijben via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 17 quoted lines
> From: Bert Huijben <bert@vmoo.com>
>
> Use the infrastructure added for finding winmerge to also
> automatically find DiffMerge,
> ...
> diff --git a/mergetools/diffmerge b/mergetools/diffmerge
> index 9b6355b98a71..458ed9a89718 100644
> --- a/mergetools/diffmerge
> +++ b/mergetools/diffmerge
> @@ -16,3 +16,7 @@ merge_cmd () {
>  exit_code_trustable () {
>  	true
>  }
> +
> +translate_merge_tool_path() {
> +	mergetool_find_win32_cmd "sgdm.exe" "SourceGear/Common/DiffMerge"
> +}

c5f424fd (mergetools/diffmerge: support DiffMerge as a git mergetool, 2013-10-13) explains that

    mergetools/diffmerge: support DiffMerge as a git mergetool
    
    DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux.
    
        See http://www.sourcegear.com/diffmerge/
    
    DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the
    graphical compare tool.

Now, I would assume sgdm.exe would be something users of Windows version of the tool may be familiar with, but how would the proposed change affect users of the tool on other platforms?

← back to recent threads