X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FRepository.pm;h=c282ebde52d6ce6113daf5896749f5c59ca9c138;hb=d9762c0e9806aa955f290f36740496f0013747fd;hp=1b88f5cb91efabf1e8adf8e5d37b2a7f6775999b;hpb=2d737d5df0b318de7cdc2d4c7c225d76f4890038;p=perl%2Fmodules%2Frgit.git diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm index 1b88f5c..c282ebd 100644 --- a/lib/App/Rgit/Repository.pm +++ b/lib/App/Rgit/Repository.pm @@ -4,7 +4,7 @@ use strict; use warnings; use Cwd qw/cwd abs_path/; -use File::Spec::Functions qw/catdir splitdir abs2rel/; +use File::Spec::Functions qw/catdir splitdir abs2rel file_name_is_absolute/; use Object::Tiny qw/fake repo bare name work/; @@ -40,15 +40,17 @@ If the C option is passed, C<$dir> isn't checked to be a valid C repo sub new { my ($class, %args) = &validate; my $dir = $args{dir}; - $dir = abs_path $dir if defined $dir; + $dir = abs_path $dir if defined $dir and not file_name_is_absolute $dir; $dir = cwd unless defined $dir; my ($repo, $bare, $name, $work); if ($args{fake}) { $work = $dir; } else { my @tries = ($dir); - push @tries, "$dir.git" unless $dir =~ /\.git$/; - push @tries, catdir($dir, '.git') unless $dir eq '.git'; + my @chunks = splitdir $dir; + my $last = pop @chunks; + push @tries, "$dir.git" unless $last =~ /\.git$/; + push @tries, catdir($dir, '.git') unless $last eq '.git'; for (@tries) { if (-d $_ && -d "$_/refs" and -d "$_/objects" and -e "$_/HEAD") { $repo = $_; @@ -56,12 +58,12 @@ sub new { } } return unless defined $repo; - my @chunks = splitdir($repo); - my $last = pop @chunks; + @chunks = splitdir $repo; + $last = pop @chunks; if ($last eq '.git') { $bare = 0; $name = $chunks[-1]; - $work = catdir(@chunks); + $work = catdir @chunks; } else { $bare = 1; ($name) = $last =~ /(.*)\.git$/;