[PATCH 06/14] difftool: use perl built-ins when testing for msys
- From
David Aguilar <davvid@gmail.com>
- Date
- Apr 6, 2009, 08:31 UTC
- Message-ID
- <1239006689-14695-7-git-send-email-davvid@gmail.com>
- In-Reply-To
- <1239006689-14695-6-git-send-email-davvid@gmail.com>
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> --- contrib/difftool/git-difftool | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/contrib/difftool/git-difftool b/contrib/difftool/git-difftool index 0deda3a..207dd50 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;
-- 1.6.2.2.414.g81aa9