From 11bf87076a686dbfe696dd21333486cab55e6fbb Mon Sep 17 00:00:00 2001 From: Tim Henigan Date: Thu, 22 Mar 2012 15:52:20 -0400 Subject: [PATCH] difftool: stop appending '.exe' to git The system call to Git works the same whether or not ".exe" is appended to "git". The extra code is not necessary. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano --- git-difftool.perl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index a399f3d2a2..a3ad389569 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -35,15 +35,6 @@ sub setup_environment $ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper'; } -sub exe -{ - my $exe = shift; - if ($^O eq 'MSWin32' || $^O eq 'msys') { - return "$exe.exe"; - } - return $exe; -} - # parse command-line options. all unrecognized options and arguments # are passed through to the 'git diff' command. my ($difftool_cmd, $extcmd, $gui, $help, $prompt); @@ -89,7 +80,7 @@ if (defined($prompt)) { } setup_environment(); -my @command = (exe('git'), 'diff', @ARGV); +my @command = ('git', 'diff', @ARGV); # ActiveState Perl for Win32 does not implement POSIX semantics of # exec* system call. It just spawns the given executable and finishes