From e9653615fafcbac6109da99fac4fa66b0b432048 Mon Sep 17 00:00:00 2001 From: Tim Henigan Date: Thu, 22 Mar 2012 15:52:21 -0400 Subject: [PATCH] difftool: eliminate setup_environment function 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 Signed-off-by: Junio C Hamano --- git-difftool.perl | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index a3ad38956..aba3d2f8c 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -29,12 +29,6 @@ USAGE exit($exitcode); } -sub setup_environment -{ - $ENV{GIT_PAGER} = ''; - $ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper'; -} - # parse command-line options. all unrecognized options and arguments # are passed through to the 'git diff' command. 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); # ActiveState Perl for Win32 does not implement POSIX semantics of -- 2.26.2