git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] mergetool: add win32 path translation for diffmerge
@ 2021-04-29 11:39 Bert Huijben via GitGitGadget
  2021-05-03  5:49 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Bert Huijben via GitGitGadget @ 2021-04-29 11:39 UTC (permalink / raw)
  To: git; +Cc: Bert Huijben, Bert Huijben

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(+)

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] mergetool: add win32 path translation for diffmerge
  2021-04-29 11:39 [PATCH] mergetool: add win32 path translation for diffmerge Bert Huijben via GitGitGadget
@ 2021-05-03  5:49 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2021-05-03  5:49 UTC (permalink / raw)
  To: Bert Huijben via GitGitGadget; +Cc: git, Bert Huijben, David Aguilar

"Bert Huijben via GitGitGadget" <gitgitgadget@gmail.com> writes:

> 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?

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-03  5:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-29 11:39 [PATCH] mergetool: add win32 path translation for diffmerge Bert Huijben via GitGitGadget
2021-05-03  5:49 ` Junio C Hamano

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).