X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Frgit.git;a=blobdiff_plain;f=lib%2FApp%2FRgit%2FConfig.pm;fp=lib%2FApp%2FRgit%2FConfig.pm;h=23874c5f0784a94c8d19508f1459d7011ac477c6;hp=66548af9fd0d2a03eaa4b9296549d7f2757f8e70;hb=a2a9110d666dcd61af2573a7ad977cf441587d21;hpb=3ff07b59ff41754a77105973a4f1e9d6d25b2c3a diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm index 66548af..23874c5 100644 --- 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: $@");