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

difftool: eliminate setup_environment function

Browse Source 
Removing this function shortens the code and makes it easier to read.
Now all environment variables are set as part of procedural operation.

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:21 -04:00 committed by Junio C Hamano
parent 11bf87076a
commit e9653615fa
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-difftool.perl
View File

@ -29,12 +29,6 @@ USAGE
exit($exitcode); exit($exitcode);
} }
sub setup_environment
{
$ENV{GIT_PAGER} = '';
$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
}
# 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);
@ -79,7 +73,8 @@ if (defined($prompt)) {
} }
} }
setup_environment(); $ENV{GIT_PAGER} = '';
$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
my @command = ('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