Merge remote-tracking branch 'upstream/master'gitolite-gentoo-3.6.12.1

4 files changed, 11 insertions, 6 deletions

diff --git a/contrib/commands/ukm b/contrib/commands/ukm
index 3683154..4bb4f3e 100755
--- a/contrib/commands/ukm
+++ b/contrib/commands/ukm
@@ -293,7 +293,7 @@ sub sanitize_pubkeypath {
 # This function is only relavant for guest key managers.
 # It returns true if the pattern is OK and false otherwise.
 sub required_guest_keyid {
-    my ($_) = @_;
+    local ($_) = @_;
     /$required_guest_pattern/ and ! /$forbidden_guest_pattern/;
 }
 
diff --git a/src/commands/help b/src/commands/help
index cf54084..47a5a16 100755
--- a/src/commands/help
+++ b/src/commands/help
@@ -12,7 +12,12 @@ Usage:  ssh git@host help       # via ssh
 
 Prints a list of custom commands available at this gitolite installation.
 
-Each command has its own help, accessed by passing it '-h' again.
+Each command has (or should have!) its own help, accessed by passing it the
+'-h' option; e.g., "gitolite access -h".
+
+NOTE: These commands are found in the commands subdirectory (see the page on
+"core and non-core gitolite" in the documentation).  Gitolite also has some
+built-in commands; run just "gitolite", with no arguments, to see those.
 =cut
 
 usage() if @ARGV;
diff --git a/t/merge-check.t b/t/merge-check.t
index fdea318..4a50db0 100755
--- a/t/merge-check.t
+++ b/t/merge-check.t
@@ -43,7 +43,7 @@ try "
     test-commit bb cc;  ok
     checkout master;    ok;     /Switched to branch 'master'/
     test-commit dd ee;  ok
-    git merge new;      ok;     /Merge made.*recursive/
+    git merge new;      ok;     /Merge made/
     test-commit ff;     ok
     tag end;            ok
 ";
diff --git a/t/partial-copy.t b/t/partial-copy.t
index 493f0d4..75dfd12 100755
--- a/t/partial-copy.t
+++ b/t/partial-copy.t
@@ -90,20 +90,20 @@ try "
     tc u4n1 u4n2
     PUSH u4 next; ok
         /To .*/foo.git/
-        /new branch\\]      ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/
+        /new reference\\]   ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/
         /file:///foo-pc/
         /52c7716..ca37871  next -> next/
     tag u4/nexttag; glt push u4 --tags
         /To file:///foo-pc/
         /\\[new tag\\]         u4/nexttag +-> +u4/nexttag/
-        /\\[new branch\\]      ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/
+        /\\[new reference\\]   ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/
 
     checkout master
     checkout -b dev/u4/u4master
     tc devu4m1 devu4m2
     PUSH u4 HEAD; ok
         /To .*/foo.git/
-        /new branch\\]      228353950557ed1eb13679c1fce4d2b4718a2060 -> refs/partial/br-\\d+/
+        /new reference\\]   228353950557ed1eb13679c1fce4d2b4718a2060 -> refs/partial/br-\\d+/
         /file:///foo-pc/
         /new branch.* HEAD -> dev/u4/u4master/