X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FRepository.pm;h=f859f8f06aa5e804f6bde023f9359023da92b89a;hb=0f55b91d632134b6077941fa223cd94378151373;hp=fd19bab29210aafb9a0a518d845b1d782e047627;hpb=caf4ff14ac06ea364ea51f725d041fd715e9682f;p=perl%2Fmodules%2Frgit.git

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index fd19bab..f859f8f 100644
--- a/lib/App/Rgit/Repository.pm
+++ b/lib/App/Rgit/Repository.pm
@@ -14,8 +14,6 @@ BEGIN {
  *WIFSIGNALED = sub { shift() & 127 } unless eval { WIFSIGNALED(0); 1 };
 }
 
-use App::Rgit::Utils qw/validate/;
-
 =head1 NAME
 
 App::Rgit::Repository - Class representing a Git repository.
@@ -44,39 +42,44 @@ If the C<fake> option is passed, C<$dir> isn't checked to be a valid C<git> repo
 =cut
 
 sub new {
- my ($class, %args) = &validate;
+ my $class = shift;
+ $class = ref $class || $class;
+
+ my %args = @_;
+
  my $dir = $args{dir};
- $dir = abs_path $dir if defined $dir and not file_name_is_absolute $dir;
- $dir = cwd       unless defined $dir;
+ $dir    = abs_path $dir if defined $dir and not file_name_is_absolute $dir;
+ $dir    = cwd       unless defined $dir;
+ $dir    = canonpath $dir;
+
  my ($repo, $bare, $name, $work);
  if ($args{fake}) {
   $repo = $work = $dir;
  } else {
-  my @tries = ($dir);
+  return unless -d $dir
+            and -d "$dir/refs"
+            and -d "$dir/objects"
+            and -e "$dir/HEAD";
+
   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 = $_;
-    last;
-   }
-  }
-  return unless defined $repo;
-  $repo = canonpath $repo;
-  @chunks = splitdir $repo;
-  $last = pop @chunks;
+  my $last   = pop @chunks;
+  return unless defined $last;
+
   if ($last eq '.git') {
    $bare = 0;
    $name = $chunks[-1];
    $work = catdir @chunks;
-  } else {
+  } elsif ($last =~ /(.+)\.git$/) {
    $bare = 1;
-   ($name) = $last =~ /(.*)\.git$/;
-   $work = $repo;
+   $name = $1;
+   $work = catdir @chunks, $last;
+  } else {
+   return;
   }
+
+  $repo = $dir;
  }
+
  bless {
   fake => !!$args{fake},
   repo => $repo,
@@ -208,7 +211,7 @@ You can find documentation for this module with the perldoc command.
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2008-2009 Vincent Pit, all rights reserved.
+Copyright 2008,2009,2010 Vincent Pit, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.