From: Tim Henigan <tim.henigan@gmail.com>
Date: Thu, 22 Mar 2012 19:52:19 +0000 (-0400)
Subject: difftool: remove explicit change of PATH
X-Git-Tag: v1.7.11-rc0~55^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=db607087d0f1256b745b9a878623060d775f1817;p=git.git

difftool: remove explicit change of PATH

Adding the script directory to PATH is not needed. The script is
located at '$(git --exec-path)', which is already on the PATH.

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 4555cd8b1..a399f3d2a 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -13,8 +13,6 @@
 use 5.008;
 use strict;
 use warnings;
-use Cwd qw(abs_path);
-use File::Basename qw(dirname);
 use Getopt::Long qw(:config pass_through);
 use Git;
 
@@ -33,8 +31,6 @@ USAGE
 
 sub setup_environment
 {
-	my $DIR = abs_path(dirname($0));
-	$ENV{PATH} = "$DIR:$ENV{PATH}";
 	$ENV{GIT_PAGER} = '';
 	$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
 }