X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Frgit.git;a=blobdiff_plain;f=lib%2FApp%2FRgit%2FRepository.pm;h=b8cd5eb7a6204cbcdd86c765db4a20bcb928a68f;hp=c7981004ffcfb97719567c4db490db87a3111c96;hb=9fa7664e0c86c59b5f9a2a03fa499c875722eaf0;hpb=eacacb3b45dddfcf7730aac933c0c85df73dbb18

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index c798100..b8cd5eb 100644
--- a/lib/App/Rgit/Repository.pm
+++ b/lib/App/Rgit/Repository.pm
@@ -110,24 +110,30 @@ sub _abs2rel {
  $a;
 }
 
+my %escapes = (
+ '^' => sub { '^' },
+ 'n' => sub { shift->name },
+ 'g' => sub { _abs2rel(shift->repo, shift->root) },
+ 'G' => sub { shift->repo },
+ 'w' => sub { _abs2rel(shift->work, shift->root) },
+ 'W' => sub { shift->work },
+ 'b' => sub {
+  my ($self, $conf) = @_;
+  _abs2rel($self->bare ? $self->repo : $self->work . '.git', $conf->root)
+ },
+ 'B' => sub { $_[0]->bare ? $_[0]->repo : $_[0]->work . '.git' },
+ 'R' => sub { $_[1]->root },
+);
+my $e = quotemeta join '', keys %escapes;
+$e = "[$e]";
+
 sub run {
  my $self = shift;
  my $conf = shift;
  return unless $conf->isa('App::Rgit::Config');
  my @args = @_;
  unless ($self->fake) {
-  my %escapes = (
-   '^' => sub { '^' },
-   'n' => sub { $self->name },
-   'g' => sub { _abs2rel($self->repo, $conf->root) },
-   'G' => sub { $self->repo },
-   'w' => sub { _abs2rel($self->work, $conf->root) },
-   'W' => sub { $self->work },
-   'b' => sub { _abs2rel($self->bare ? $self->repo : $self->work . '.git', $conf->root) },
-   'B' => sub { $self->bare ? $self->repo : $self->work . '.git' },
-   'R' => sub { $conf->root },
-  );
-  s/\^([\^ngGwWbBR])/$escapes{$1}->()/eg for @args;
+  s/\^($e)/$escapes{$1}->($self, $conf)/eg for @args;
  }
  {
   local $ENV{GIT_DIR} = $self->repo if exists $ENV{GIT_DIR};