difftool: use perl built-ins when testing for msys
I don't even know what $COMSPEC means so let's be safe and use the same perly $^O test add--interactive uses. While we're at it, make git-difftool match the prevalent git-perl style. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Apr 6, 2009 at 01:31 UTC
46ae156d6c8c48d521e4d858ed84d93259cfc61f
1 file changed
+5
-2
contrib/difftool/git-difftool
+5
-2
@@ -33,7 +33,10 @@ sub setup_environment
33
sub exe
34
{
35
my $exe = shift;
36
- return defined $ENV{COMSPEC} ? "$exe.exe" : $exe;
36
+ if ($^O eq 'MSWin32' || $^O eq 'msys') {
37
+ return "$exe.exe";
38
+ }
39
+ return $exe;
40
}
41
42
sub generate_command
@@ -47,7 +50,7 @@ sub generate_command
50
$skip_next = 0;
51
next;
52
}
50
- if ($arg eq '-t' or $arg eq '--tool') {
53
+ if ($arg eq '-t' || $arg eq '--tool') {
54
usage() if $#ARGV <= $idx;
55
$ENV{GIT_DIFF_TOOL} = $ARGV[$idx + 1];
56
$skip_next = 1;