From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Git <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
msysGit <msysgit@googlegroups.com>,
Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: [PATCH 7/8] mergetools: use the correct tool for Beyond Compare 3 on Windows
Date: Fri, 14 Oct 2011 23:53:34 +0100 [thread overview]
Message-ID: <1318632815-29945-8-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <1318632815-29945-1-git-send-email-patthoyts@users.sourceforge.net>
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.
Reported-by: Werner BEROUX <werner@beroux.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
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
}
--
1.7.7.1.gbba15
next prev parent reply other threads:[~2011-10-14 22:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 22:53 [PATCH 0/8] Some patches from msysGit Pat Thoyts
2011-10-14 22:53 ` [PATCH 1/8] t1020: disable the pwd test on MinGW Pat Thoyts
2011-10-14 22:53 ` [PATCH 2/8] t1402: Ignore a few cases that must fail due to DOS path expansion Pat Thoyts
2011-10-15 5:36 ` Junio C Hamano
2011-10-15 13:49 ` Pat Thoyts
2011-10-15 20:15 ` Junio C Hamano
2011-10-14 22:53 ` [PATCH 3/8] t9001: do not fail only due to CR/LF issues Pat Thoyts
2011-10-14 22:53 ` [PATCH 4/8] git-svn: On MSYS, escape and quote SVN_SSH also if set by the user Pat Thoyts
2011-10-14 22:53 ` [PATCH 5/8] t9901: fix line-ending dependency on windows Pat Thoyts
2011-10-15 5:44 ` Junio C Hamano
2011-10-15 12:25 ` Pat Thoyts
2011-10-14 22:53 ` [PATCH 6/8] t9300: do not run --cat-blob-fd related tests on MinGW Pat Thoyts
2011-10-14 22:53 ` Pat Thoyts [this message]
2011-10-15 5:50 ` [PATCH 7/8] mergetools: use the correct tool for Beyond Compare 3 on Windows Junio C Hamano
2011-10-15 10:27 ` Sebastian Schuberth
2011-10-15 12:39 ` Pat Thoyts
2011-10-16 10:12 ` Sebastian Schuberth
2011-10-16 10:21 ` Sebastian Schuberth
2011-10-15 20:14 ` Junio C Hamano
2011-10-16 10:11 ` Sebastian Schuberth
2011-10-14 22:53 ` [PATCH 8/8] mingw: ensure sockets are initialized before calling gethostname Pat Thoyts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318632815-29945-8-git-send-email-patthoyts@users.sourceforge.net \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).