From: Vincent Pit <vince@profvince.com>
Date: Tue, 23 Feb 2010 23:41:01 +0000 (+0100)
Subject: Simplify repository check
X-Git-Tag: v0.07~22
X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=3051ac76178c03ab7a6e1c1e87a2533a84a738b7;p=perl%2Fmodules%2Frgit.git

Simplify repository check
---

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index 1d8d490..f7b03d7 100644
--- a/lib/App/Rgit/Repository.pm
+++ b/lib/App/Rgit/Repository.pm
@@ -48,37 +48,36 @@ sub new {
  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 "$_/objects"
+            and -e "$_/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 {