Re: [PATCH 7/8] mergetools: use the correct tool for Beyond Compare 3 on Windows
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:16
Pat Thoyts [off-list ref] writes:
On Windows the bcompare tool launches a graphical program and does not wait for it to terminate. A separate 'bcomp' tool is provided which will wait for the view to exit so we use this instead.
Hmm, does this only apply to Windows, or are there other platforms on
which BC3 supplies bcomp for the exact same reason? What I am trying to
get at is that it might be nicer if we do not have to check uname, e.g.
if type bcomp >/dev/null 2>/dev/null
then
echo bcomp
else
echo bcompare
fi
quoted hunk
Reported-by: Werner BEROUX <redacted> Signed-off-by: Pat Thoyts <redacted> --- mergetools/bc3 | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)diff --git a/mergetools/bc3 b/mergetools/bc3 index 27b3dd4..b642bf2 100644 --- a/mergetools/bc3 +++ b/mergetools/bc3@@ -16,5 +16,12 @@ merge_cmd () { } translate_merge_tool_path() { - echo bcompare + case $(uname -s) in + *MINGW*) + echo bcomp + ;; + *) + echo bcompare + ;; + esac }