Only apply abs_path() to paths that are either relative or that contains ..

[perl/modules/rgit.git] / lib / App / Rgit / Config.pm

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index 66548af9fd0d2a03eaa4b9296549d7f2757f8e70..23874c5f0784a94c8d19508f1459d7011ac477c6 100644 (file)
--- a/lib/App/Rgit/Config.pm
+++ b/lib/App/Rgit/Config.pm
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 
 use Carp       (); # confess
-use Cwd        (); # cwd, abs_path
+use Cwd        (); # cwd
 use File::Spec (); # canonpath, catfile, path
 
 use App::Rgit::Repository;
-use App::Rgit::Utils qw/:levels/;
+use App::Rgit::Utils qw/:levels/; # :levels, abs_path
 
 use constant IS_WIN32 => $^O eq 'MSWin32';
 
@@ -50,7 +50,7 @@ sub new {
                   ? $ENV{GIT_DIR}
                   : Cwd::cwd;
  Carp::confess("Invalid root directory") unless -d $root;
- $root = File::Spec->canonpath(Cwd::abs_path($root));
+ $root = File::Spec->canonpath(App::Rgit::Utils::abs_path($root));
 
  my $git;
  my @candidates = (
@@ -74,7 +74,7 @@ sub new {
   }
  }
  Carp::confess("Couldn't find a proper git executable") unless defined $git;
- $git = File::Spec->canonpath(Cwd::abs_path($git));
+ $git = File::Spec->canonpath(App::Rgit::Utils::abs_path($git));
 
  my $conf = 'App::Rgit::Config::Default';
  eval "require $conf; 1" or Carp::confess("Couldn't load $conf: $@");