Skip to content

Commit

Permalink
(some minor changes)
Browse files Browse the repository at this point in the history
  - whitespace change to t/reset
  - remove dbg line accidentally left in in Load.pm
  - add a bit more explanation to 'writable'
  • Loading branch information
sitaramc committed Apr 5, 2012
1 parent 9bbc570 commit 7c6728a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion check-g2-compat
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ sub conf {
chdir($GL_ADMINDIR);

my $conf = `find . -name "*.conf" | xargs cat`;
msg( "SEVERE", "fallthru in NAME rules; see docs" ) if $conf =~ m(NAME/);
msg( "SEVERE", "NAME rules; see docs" ) if $conf =~ m(NAME/);
msg( "SEVERE", "subconf command in admin repo; see docs" ) if $conf =~ m(NAME/conf/fragments);
msg( "SEVERE", "mirroring used; see docs" ) if $conf =~ m(config +gitolite\.mirror\.);
}
Expand Down
1 change: 0 additions & 1 deletion src/Gitolite/Conf/Load.pm
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ sub load_1 {

my @repos = memberships( 'repo', $repo );
my @users = memberships( 'user', $user, $repo );
dbg(\@users);
trace( 3, "memberships: " . scalar(@repos) . " repos and " . scalar(@users) . " users found" );

for my $r (@repos) {
Expand Down
3 changes: 3 additions & 0 deletions src/commands/writable
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ use Gitolite::Easy;
=for usage
Usage: gitolite writable <reponame>|@all on|off
Disable/re-enable pushes to all repos or named repo. Useful to run
non-git-aware backups and so on.
'on' enables, 'off' disables, writes (pushes) to the named repo or all repos.
With 'off', any subsequent text is taken to be the message to be shown to
Expand Down
10 changes: 5 additions & 5 deletions t/reset
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ use Cwd;
my $workdir = getcwd();

confreset;confadd '
repo foo/..*
C = u1 u2 u3
RW+ = CREATOR
RW = WRITERS
R = READERS
repo foo/..*
C = u1 u2 u3
RW+ = CREATOR
RW = WRITERS
R = READERS
';

try "ADMIN_PUSH set1; !/FATAL/" or die text();
Expand Down

0 comments on commit 7c6728a

Please sign in to comment.