aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2020-06-16 15:34:37 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2020-06-16 15:34:37 -0700
commite73fb9a2ec2455c29a814f1507efaf39275baea9 (patch)
treecd3c44d5bd82da0211b9e5493bd6cf1f29b24668 /src/lib/Gitolite
parentMerge tag 'v3.6.9' (diff)
parentv3.6.10 (diff)
downloadgitolite-gentoo-e73fb9a2ec2455c29a814f1507efaf39275baea9.tar.gz
gitolite-gentoo-e73fb9a2ec2455c29a814f1507efaf39275baea9.tar.bz2
gitolite-gentoo-e73fb9a2ec2455c29a814f1507efaf39275baea9.zip
Merge tag 'v3.6.10'gitolite-gentoo-3.6.10
v3.6.10
Diffstat (limited to 'src/lib/Gitolite')
-rw-r--r--src/lib/Gitolite/Common.pm2
-rw-r--r--src/lib/Gitolite/Conf/Load.pm1
2 files changed, 1 insertions, 2 deletions
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;