X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FConfig.pm;h=29ebd7bd42b81445dda9ff07fea62e8861990cdc;hb=c39af12272015e8aff09d3c05e4f32d7943b4154;hp=94a3359ff98767303214c7a5e1a8a25afb0cbd8e;hpb=1df4b5b8d8d71567094a0c6ec3702ab71b614bd9;p=perl%2Fmodules%2Frgit.git

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index 94a3359..29ebd7b 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        (); # 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';
 
@@ -18,11 +18,11 @@ App::Rgit::Config - Base class for App::Rgit configurations.
 
 =head1 VERSION
 
-Version 0.06
+Version 0.08
 
 =cut
 
-our $VERSION = '0.06';
+our $VERSION = '0.08';
 
 =head1 DESCRIPTION
 
@@ -44,9 +44,13 @@ sub new {
 
  my %args = @_;
 
- my $root = $args{root};
- return unless defined $root and -d $root;
- $root = File::Spec->canonpath(Cwd::abs_path($root));
+ my $root = defined $args{root}
+              ? $args{root}
+              : defined $ENV{GIT_DIR}
+                  ? $ENV{GIT_DIR}
+                  : Cwd::cwd;
+ Carp::confess("Invalid root directory") unless -d $root;
+ $root = File::Spec->canonpath(App::Rgit::Utils::abs_path($root));
 
  my $git;
  my @candidates = (
@@ -70,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: $@");