deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix repo alias to work when reponame has leading "/"

Browse source 
as in git@host:repo.git works but ssh://git@host/repo.git doesn't
This commit is contained in:
Sitaram Chamarty 2012-05-22 11:45:05 +05:30
parent b6ce11a19f
commit 55d64752ae
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Gitolite/Triggers/Alias.pm
View file

@ -61,7 +61,7 @@ sub input {
my $git_commands = "git-upload-pack|git-receive-pack|git-upload-archive"; my $git_commands = "git-upload-pack|git-receive-pack|git-upload-archive";
my $user = $ARGV[0] || '@all'; # user name is undocumented for now my $user = $ARGV[0] || '@all'; # user name is undocumented for now
if ( $ENV{SSH_ORIGINAL_COMMAND} =~ /(?:$git_commands) '(\S+)'$/ ) { if ( $ENV{SSH_ORIGINAL_COMMAND} =~ /(?:$git_commands) '\/?(\S+)'$/ ) {
my $repo = $1; my $repo = $1;
( my $norm = $repo ) =~ s/\.git$//; # normalised repo name ( my $norm = $repo ) =~ s/\.git$//; # normalised repo name
@ -73,7 +73,7 @@ sub input {
_warn "'$norm' is an alias for '$target'"; _warn "'$norm' is an alias for '$target'";
$ENV{SSH_ORIGINAL_COMMAND} =~ s/'$repo'/'$target'/; $ENV{SSH_ORIGINAL_COMMAND} =~ s/'\/?$repo'/'$target'/;
} }
} }