undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: use perl built-ins when testing for msys

Browse Source 
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>
This commit is contained in:
David Aguilar 2009-04-06 01:31:21 -07:00 committed by Junio C Hamano
parent 2e8af7e42b
commit 46ae156d6c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/difftool/git-difftool
View File

@ -33,7 +33,10 @@ sub setup_environment
sub exe sub exe
{ {
my $exe = shift; 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 sub generate_command
@ -47,7 +50,7 @@ sub generate_command
$skip_next = 0; $skip_next = 0;
next; next;
} }
if ($arg eq '-t' or $arg eq '--tool') { if ($arg eq '-t' || $arg eq '--tool') {
usage() if $#ARGV <= $idx; usage() if $#ARGV <= $idx;
$ENV{GIT_DIFF_TOOL} = $ARGV[$idx + 1]; $ENV{GIT_DIFF_TOOL} = $ARGV[$idx + 1];
$skip_next = 1; $skip_next = 1;