mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: stop appending '.exe' to git

Browse Source 
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>
This commit is contained in:
Tim Henigan
2012-03-22 15:52:20 -04:00
committed by Junio C Hamano
parent db607087d0
commit 11bf87076a
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
git-difftool.perl
View File

@ -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 # parse command-line options. all unrecognized options and arguments
# are passed through to the 'git diff' command. # are passed through to the 'git diff' command.
my ($difftool_cmd, $extcmd, $gui, $help, $prompt); my ($difftool_cmd, $extcmd, $gui, $help, $prompt);
@ -89,7 +80,7 @@ if (defined($prompt)) {
} }
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 # ActiveState Perl for Win32 does not implement POSIX semantics of
# exec* system call. It just spawns the given executable and finishes # exec* system call. It just spawns the given executable and finishes