From: David Aguilar <davvid@gmail.com>
Date: Mon, 6 Apr 2009 08:31:21 +0000 (-0700)
Subject: difftool: use perl built-ins when testing for msys
X-Git-Tag: v1.6.3-rc1~13^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46ae156d6c8c48d521e4d858ed84d93259cfc61f;p=git.git

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>
---

diff --git a/contrib/difftool/git-difftool b/contrib/difftool/git-difftool
index 0deda3a0e..207dd50f2 100755
--- a/contrib/difftool/git-difftool
+++ b/contrib/difftool/git-difftool
@@ -33,7 +33,10 @@ sub setup_environment
 sub exe
 {
 	my $exe = shift;
-	return defined $ENV{COMSPEC} ? "$exe.exe" : $exe;
+	if ($^O eq 'MSWin32' || $^O eq 'msys') {
+		return "$exe.exe";
+	}
+	return $exe;
 }
 
 sub generate_command
@@ -47,7 +50,7 @@ sub generate_command
 			$skip_next = 0;
 			next;
 		}
-		if ($arg eq '-t' or $arg eq '--tool') {
+		if ($arg eq '-t' || $arg eq '--tool') {
 			usage() if $#ARGV <= $idx;
 			$ENV{GIT_DIFF_TOOL} = $ARGV[$idx + 1];
 			$skip_next = 1;