summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2012-07-25 03:14:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-26 20:07:15 (GMT)
commit190f5475f2a7edb777b65367d8796177aa13c830 (patch)
tree3e0acfa9d35305396c2647a523f36928bfec412d /git-difftool.perl
parentceb1497a74e75a0c9bd53716b787d33ad6e2397f (diff)
downloadgit-190f5475f2a7edb777b65367d8796177aa13c830.zip
git-190f5475f2a7edb777b65367d8796177aa13c830.tar.gz
git-190f5475f2a7edb777b65367d8796177aa13c830.tar.bz2
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>
Diffstat (limited to 'git-difftool.perl')
-rwxr-xr-xgit-difftool.perl3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-difftool.perl b/git-difftool.perl
index 6f8bb73..17d4de6 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},