X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FRepository.pm;h=dbdfe731a86970373395bbca4138676d748675cc;hb=c3b443e68bbe06efc7c40f0f9ace3919a6d0864b;hp=2fa3837d7c22e9b1e175d9c6069ef41e0cb6bf97;hpb=efa8c661b3f2394fec9b0a494fabc6efc27e1328;p=perl%2Fmodules%2Frgit.git

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index 2fa3837..dbdfe73 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 file_name_is_absolute/;
+use File::Spec::Functions qw/canonpath catdir splitdir abs2rel file_name_is_absolute/;
 use POSIX qw/WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG SIGINT SIGQUIT/;
 
 BEGIN {
@@ -66,6 +66,7 @@ sub new {
    }
   }
   return unless defined $repo;
+  $repo = canonpath $repo;
   @chunks = splitdir $repo;
   $last = pop @chunks;
   if ($last eq '.git') {
@@ -118,7 +119,7 @@ sub _abs2rel {
 }
 
 my %escapes = (
- '^' => sub { '^' },
+ '@' => sub { '@' },
  'n' => sub { shift->name },
  'g' => sub { _abs2rel(shift->repo, shift->root) },
  'G' => sub { shift->repo },
@@ -140,7 +141,7 @@ sub run {
  return unless $conf->isa('App::Rgit::Config');
  my @args = @_;
  unless ($self->fake) {
-  s/\^($e)/$escapes{$1}->($self, $conf)/eg for @args;
+  s/@($e)/$escapes{$1}->($self, $conf)/eg for @args;
  }
  unshift @args, $conf->git;
  $conf->info('Executing "', join(' ', @args), '" into ', $self->work, "\n");