From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Tim Henigan <tim.henigan@gmail.com>, git@vger.kernel.org
Subject: [PATCH 3/3] difftool: Disable --symlinks on cygwin
Date: Tue, 24 Jul 2012 20:14:24 -0700 [thread overview]
Message-ID: <1343186064-49350-4-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1343186064-49350-1-git-send-email-davvid@gmail.com>
Symlinks are not ubiquitous on Windows so make --no-symlinks the default.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
I don't have cygwin so I can't verify this one myself.
Is 'cygwin' really the value of $^O there?
git-difftool.perl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index 591ee75..10d3d97 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -291,7 +291,8 @@ sub main
gui => undef,
help => undef,
prompt => undef,
- symlinks => $^O ne 'MSWin32' && $^O ne 'msys',
+ symlinks => $^O ne 'cygwin' &&
+ $^O ne 'MSWin32' && $^O ne 'msys',
tool_help => undef,
);
GetOptions('g|gui!' => \$opts{gui},
--
1.7.12.rc0.15.g8157c39
next prev parent reply other threads:[~2012-07-25 3:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 3:14 [PATCH 0/3] Incremental updates for da/difftool-updates David Aguilar
2012-07-25 3:14 ` [PATCH 1/3] difftool: Handle finding mergetools/ in a path with spaces David Aguilar
2012-07-25 3:14 ` [PATCH 2/3] difftool: Check all return codes from compare() David Aguilar
2012-07-25 3:14 ` David Aguilar [this message]
2012-07-25 19:39 ` [PATCH 3/3] difftool: Disable --symlinks on cygwin Stefano Lattarini
2012-07-26 11:31 ` Erik Faye-Lund
2012-07-26 17:39 ` David Aguilar
2012-07-26 19:04 ` Junio C Hamano
2012-07-25 16:36 ` [PATCH 0/3] Incremental updates for da/difftool-updates Junio C Hamano
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=1343186064-49350-4-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tim.henigan@gmail.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).