[ARVADOS] updated: 4b8da3c9e3a48820ae3b1538103eda0282118392

[git at public.curoverse.com]

Summary of changes:
 services/arv-git-httpd/doc.go              | 26 ++++++++++++++++----------
 services/arv-git-httpd/git_handler.go      |  2 +-
 services/arv-git-httpd/git_handler_test.go | 12 ++++++------
 3 files changed, 23 insertions(+), 17 deletions(-)

       via  4b8da3c9e3a48820ae3b1538103eda0282118392 (commit)
       via  bb7be2d3e49876a74fddb76260f3eac07bf0a431 (commit)
      from  6feefc59c459d778046a83cb29178afc04acdf1c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4b8da3c9e3a48820ae3b1538103eda0282118392
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 26 21:44:57 2015 -0400

    6263: gofmt

diff --git a/services/arv-git-httpd/git_handler.go b/services/arv-git-httpd/git_handler.go
index 96ab674..0312b29 100644
--- a/services/arv-git-httpd/git_handler.go
+++ b/services/arv-git-httpd/git_handler.go
@@ -31,7 +31,7 @@ func newGitHandler() http.Handler {
 				"GITOLITE_HTTP_HOME",
 				"GL_BYPASS_ACCESS_CHECKS",
 			},
-			Args:       []string{"http-backend"},
+			Args: []string{"http-backend"},
 		},
 	}
 }
diff --git a/services/arv-git-httpd/git_handler_test.go b/services/arv-git-httpd/git_handler_test.go
index e24679f..b3e49c5 100644
--- a/services/arv-git-httpd/git_handler_test.go
+++ b/services/arv-git-httpd/git_handler_test.go
@@ -12,15 +12,15 @@ import (
 
 var _ = check.Suite(&GitHandlerSuite{})
 
-type GitHandlerSuite struct {}
+type GitHandlerSuite struct{}
 
 func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
 	u, err := url.Parse("git.zzzzz.arvadosapi.com/test")
 	c.Check(err, check.Equals, nil)
 	resp := httptest.NewRecorder()
 	req := &http.Request{
-		Method: "GET",
-		URL: u,
+		Method:     "GET",
+		URL:        u,
 		RemoteAddr: "[::1]:12345",
 	}
 	h := newGitHandler()
@@ -37,7 +37,7 @@ func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
 	c.Check(body, check.Matches, `(?ms).*^GL_BYPASS_ACCESS_CHECKS=yesplease$.*`)
 	c.Check(body, check.Matches, `(?ms).*^REMOTE_HOST=::1$.*`)
 	c.Check(body, check.Matches, `(?ms).*^REMOTE_PORT=12345$.*`)
-	c.Check(body, check.Matches, `(?ms).*^SERVER_ADDR=` + regexp.QuoteMeta(theConfig.Addr) + `$.*`)
+	c.Check(body, check.Matches, `(?ms).*^SERVER_ADDR=`+regexp.QuoteMeta(theConfig.Addr)+`$.*`)
 }
 
 func (s *GitHandlerSuite) TestCGIError(c *check.C) {
@@ -45,8 +45,8 @@ func (s *GitHandlerSuite) TestCGIError(c *check.C) {
 	c.Check(err, check.Equals, nil)
 	resp := httptest.NewRecorder()
 	req := &http.Request{
-		Method: "GET",
-		URL: u,
+		Method:     "GET",
+		URL:        u,
 		RemoteAddr: "bogus",
 	}
 	h := newGitHandler()

commit bb7be2d3e49876a74fddb76260f3eac07bf0a431
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 26 21:21:15 2015 -0400

    6263: Update doc.go: mention gitolite-shell.

diff --git a/services/arv-git-httpd/doc.go b/services/arv-git-httpd/doc.go
index 713b018..ff4599d 100644
--- a/services/arv-git-httpd/doc.go
+++ b/services/arv-git-httpd/doc.go
@@ -1,29 +1,35 @@
 /*
 arv-git-httpd provides authenticated access to Arvados-hosted git repositories.
 
+See http://doc.arvados.org/install/install-arv-git-httpd.html.
+
 Example:
+
 	arv-git-httpd -address=:8000 -repo-root=/var/lib/arvados/git
 
 Options:
 
 	-address [host]:[port]
 
-		Listen at the given host and port. Each can be a name,
-		a number, or empty.
+Listen at the given host and port.
+
+Host can be a domain name, an IP address, or empty (listen on all
+addresses).
+
+Port can be a name, a port number, or 0 (choose an available port).
 
 	-repo-root path
 
-		Directory containing git repositories. When a client
-		requests either "foo/bar.git" or "foo/bar/.git",
-		git-http-backend will be invoked on "path/foo/bar.git"
-		or (if that doesn't exist) "path/foo/bar/.git".
+Directory containing git repositories. When a client requests either
+"foo/bar.git" or "foo/bar/.git", git-http-backend will be invoked on
+"path/foo/bar.git" or (if that doesn't exist) "path/foo/bar/.git".
 
 	-git-command path
 
-		Location of the CGI program to execute for each
-		authorized request (normally this is git). It is
-		invoked with a single argument, 'http-backend'.
-		Default is /usr/bin/git.
+Location of the CGI program to execute for each authorized request
+(normally this is gitolite-shell if repositories are controlled by
+gitolite, otherwise git). It is invoked with a single argument,
+'http-backend'.  Default is /usr/bin/git.
 
 */
 package main

-----------------------------------------------------------------------


hooks/post-receive
--