diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rwxr-xr-x | src/gitolite-shell | 7 | ||||
| -rw-r--r-- | src/lib/Gitolite/Common.pm | 2 | ||||
| -rw-r--r-- | src/lib/Gitolite/Conf/Load.pm | 1 |
4 files changed, 4 insertions, 9 deletions
@@ -1,3 +1,6 @@ +2018-09-30 v3.6.10 fix up boo-boo caused by previous release; see mails on + list for details + 2018-08-07 v3.6.9 prevent racy access to repos in process of migration to gitolite diff --git a/src/gitolite-shell b/src/gitolite-shell index 684d400..e8efe3d 100755 --- a/src/gitolite-shell +++ b/src/gitolite-shell @@ -113,13 +113,6 @@ sub main { $ENV{GL_REPO} = $repo; my $aa = ( $verb =~ 'upload' ? 'R' : 'W' ); - # catch rare race when moving repos into gitolite control - _die "$aa any $repo $user DENIED by fallthru" . - "\n(or you mis-spelled the reponame)" - unless update_hook_present($repo); - # this error message is exactly the same as that from elsewhere in the - # code, for the usual reasons (avoid leaking information) - # set up env vars from options set for this repo env_options($repo, $user); diff --git a/src/lib/Gitolite/Common.pm b/src/lib/Gitolite/Common.pm index 3f47b37..af9c875 100644 --- a/src/lib/Gitolite/Common.pm +++ b/src/lib/Gitolite/Common.pm @@ -239,8 +239,6 @@ sub cleanup_conf_line { $repo =~ s(^\./)(); next if $repo =~ m(/$); # tolerate non-bare repos within ~/repositories but silently ignore them - next unless update_hook_present($repo); - # ignore repos that don't yet have the update hook push @phy_repos, $repo; } trace( 3, scalar(@phy_repos) . " physical repos found" ); diff --git a/src/lib/Gitolite/Conf/Load.pm b/src/lib/Gitolite/Conf/Load.pm index 1679f13..8abd386 100644 --- a/src/lib/Gitolite/Conf/Load.pm +++ b/src/lib/Gitolite/Conf/Load.pm @@ -73,6 +73,7 @@ sub access { trace( 2, $repo, $user, $aa, $ref ); _die "invalid user '$user'" if not( $user and $user =~ $USERNAME_PATT ); sanity($repo); + return "$aa any $repo $user DENIED by fallthru" unless update_hook_present($repo); my @rules; my $deny_rules; |