From: David Aguilar <davvid@gmail.com>
Date: Wed, 25 Jul 2012 03:14:24 +0000 (-0700)
Subject: difftool: Disable --symlinks on cygwin
X-Git-Tag: v1.8.0-rc0~129^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190f5475f2a7edb777b65367d8796177aa13c830;p=thirdparty%2Fgit.git

difftool: Disable --symlinks on cygwin

Symlinks are not ubiquitous on Windows so make --no-symlinks the default.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-difftool.perl b/git-difftool.perl
index 6f8bb73cd6..17d4de6618 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -338,7 +338,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},