Permalink
Browse files

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>
  • Loading branch information...
1 parent ceb1497 commit 190f5475f2a7edb777b65367d8796177aa13c830 @davvid davvid committed with gitster Jul 25, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 git-difftool.perl
View
@@ -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},

0 comments on commit 190f547

Please sign in to comment.