difftool: eliminate setup_environment function

thenigan · gitster · commit e9653615fafc · 2012-03-23T11:46:26.000-07:00
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 &lt;tim.henigan@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-difftool.perl b/git-difftool.perl
@@ -29,12 +29,6 @@ sub 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 @@ sub setup_environment
 	}
 }
 
-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

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,6 @@ sub usage`
`29`	`29`	`exit($exitcode);`
`30`	`30`	`}`
`31`	`31`
`32`		`-sub setup_environment`
`33`		`-{`
`34`		`- $ENV{GIT_PAGER} = '';`
`35`		`- $ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';`
`36`		`-}`
`37`		`-`
`38`	`32`	`# parse command-line options. all unrecognized options and arguments`
`39`	`33`	`# are passed through to the 'git diff' command.`
`40`	`34`	`my ($difftool_cmd, $extcmd, $gui, $help, $prompt);`
`@@ -79,7 +73,8 @@ sub setup_environment`
`79`	`73`	`}`
`80`	`74`	`}`
`81`	`75`
`82`		`-setup_environment();`
	`76`	`+$ENV{GIT_PAGER} = '';`
	`77`	`+$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';`
`83`	`78`	`my @command = ('git', 'diff', @ARGV);`
`84`	`79`
`85`	`80`	`# ActiveState Perl for Win32 does not implement POSIX semantics of`