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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-difftool.perl b/git-difftool.perl
index a399f3d2a23ea69f8e84f31070e00aeb4845dc32..a3ad389569dda38ea08cba59530a43005e814c60 100755 (executable)
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -35,15 +35,6 @@ sub setup_environment
        $ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
 }
 
        $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);
 # 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 @@ sub exe
 }
 
 setup_environment();
 }
 
 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
 
 # ActiveState Perl for Win32 does not implement POSIX semantics of
 # exec* system call. It just spawns the given executable and finishes