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

a few minor changes

Browse source 
* minor typos
  * perltidy on Tsh
  * a minor optimisation to "do" in gl-conf
  * remove inapplicable caveat in fork command
This commit is contained in:
Sitaram Chamarty 2012-11-22 20:22:35 +05:30
parent b6d6260dbb
commit 2741fadc9d
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Gitolite/Conf/Load.pm
View file

@ -248,7 +248,7 @@ sub load_1 {
if ( -f "gl-conf" ) {
_warn "split conf not set, gl-conf present for '$repo'" if not $split_conf{$repo};
my $cc = "gl-conf";
my $cc = "./gl-conf";
_die "parse '$cc' failed: " . ( $! or $@ ) unless do $cc;
$last_repo = $repo;

11
src/lib/Gitolite/Test/Tsh.pm
View file

@ -261,7 +261,12 @@ sub rc_lines {
$cmd = shift @cmds;
# is the current command a "testing" command?
my $testing_cmd = ( $cmd =~ m(^ok(?:\s+or\s+(.*))?$) or $cmd =~ m(^!ok(?:\s+or\s+(.*))?$) or $cmd =~ m(^/(.*?)/(?:\s+or\s+(.*))?$) or $cmd =~ m(^!/(.*?)/(?:\s+or\s+(.*))?$) );
my $testing_cmd = (
$cmd =~ m(^ok(?:\s+or\s+(.*))?$)
or $cmd =~ m(^!ok(?:\s+or\s+(.*))?$)
or $cmd =~ m(^/(.*?)/(?:\s+or\s+(.*))?$)
or $cmd =~ m(^!/(.*?)/(?:\s+or\s+(.*))?$)
);
# warn if the previous command failed but rc is not being checked
if ( $rc and not $testing_cmd ) {
@ -474,7 +479,7 @@ sub fail {
sub cmp {
# compare input string with second input string or text()
my $in = shift;
my $in = shift;
my $text = ( @_ ? +shift : text() );
if ( $text eq $in ) {
@ -583,7 +588,7 @@ sub dummy_commits {
test_tick();
next;
}
my $ts = ( $tick ? gmtime($tick+19800) : gmtime() );
my $ts = ( $tick ? gmtime( $tick + 19800 ) : gmtime() );
_sh("echo $f at $ts >> $f && git add $f && git commit -m '$f at $ts'");
}
}