From 2741fadc9d2538eeafa12cc8b91f2e19b9b05b1a Mon Sep 17 00:00:00 2001
From: Sitaram Chamarty <sitaram@atc.tcs.com>
Date: Thu, 22 Nov 2012 20:22:35 +0530
Subject: [PATCH] a few minor changes

  * minor typos
  * perltidy on Tsh
  * a minor optimisation to "do" in gl-conf
  * remove inapplicable caveat in fork command
---
 README.txt                    |  2 +-
 src/commands/fork             |  4 ----
 src/lib/Gitolite/Conf/Load.pm |  2 +-
 src/lib/Gitolite/Test/Tsh.pm  | 11 ++++++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.txt b/README.txt
index 468062e..08fed1c 100644
--- a/README.txt
+++ b/README.txt
@@ -219,7 +219,7 @@ ACCESS RULES
 GROUPS
 ------
 
-    Gitolite allows you to groups users or repos for convenience.  Here's an
+    Gitolite allows you to group users or repos for convenience.  Here's an
     example that creates two groups of users:
 
         @staff      =   alice bob carol
diff --git a/src/commands/fork b/src/commands/fork
index 1d68d64..b381662 100755
--- a/src/commands/fork
+++ b/src/commands/fork
@@ -10,10 +10,6 @@
 # traffic but because it uses git clone's "-l" option to share the object
 # store also, so it is likely to be almost instantaneous, regardless of how
 # big the repo actually is.
-#
-# The only caveat is that the repo you cloned *from* must not later become
-# unavailable in any way.  If you cannot be sure of this, take the scenic
-# route (clone repo1, push to repo2).
 
 die() { echo "$@" >&2; exit 1; }
 usage() { perl -lne 'print substr($_, 2) if /^# Usage/../^$/' < $0; exit 1; }
diff --git a/src/lib/Gitolite/Conf/Load.pm b/src/lib/Gitolite/Conf/Load.pm
index 9a09793..00a6b8a 100644
--- a/src/lib/Gitolite/Conf/Load.pm
+++ b/src/lib/Gitolite/Conf/Load.pm
@@ -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;
diff --git a/src/lib/Gitolite/Test/Tsh.pm b/src/lib/Gitolite/Test/Tsh.pm
index 2b7dcee..b3c43e0 100644
--- a/src/lib/Gitolite/Test/Tsh.pm
+++ b/src/lib/Gitolite/Test/Tsh.pm
@@ -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'");
     }
 }