diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-11-21 08:43:11 +0100 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-11-21 08:43:11 +0100 |
| commit | 5eb1c562e7deb4191cb160af91a864fb783c1041 (patch) | |
| tree | 090b3fef25c728381f384f9e04a86fa9905549c8 /plumbing/transport/ssh | |
| parent | 90796406c0755f61761fb176cdfe6106f00d903c (diff) | |
| download | go-git-5eb1c562e7deb4191cb160af91a864fb783c1041.tar.gz | |
*: add pointer to the new transport.Endpoint struct
Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
Diffstat (limited to 'plumbing/transport/ssh')
| -rw-r--r-- | plumbing/transport/ssh/common.go | 14 | ||||
| -rw-r--r-- | plumbing/transport/ssh/upload_pack_test.go | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plumbing/transport/ssh/common.go b/plumbing/transport/ssh/common.go index a844c78..b7722bb 100644 --- a/plumbing/transport/ssh/common.go +++ b/plumbing/transport/ssh/common.go @@ -31,7 +31,7 @@ type runner struct { config *ssh.ClientConfig } -func (r *runner) Command(cmd string, ep transport.Endpoint, auth transport.AuthMethod) (common.Command, error) { +func (r *runner) Command(cmd string, ep *transport.Endpoint, auth transport.AuthMethod) (common.Command, error) { c := &command{command: cmd, endpoint: ep, config: r.config} if auth != nil { c.setAuth(auth) @@ -47,7 +47,7 @@ type command struct { *ssh.Session connected bool command string - endpoint transport.Endpoint + endpoint *transport.Endpoint client *ssh.Client auth AuthMethod config *ssh.ClientConfig @@ -122,8 +122,8 @@ func (c *command) connect() error { } func (c *command) getHostWithPort() string { - host := c.endpoint.Host() - port := c.endpoint.Port() + host := c.endpoint.Host + port := c.endpoint.Port if port <= 0 { port = DefaultPort } @@ -133,12 +133,12 @@ func (c *command) getHostWithPort() string { func (c *command) setAuthFromEndpoint() error { var err error - c.auth, err = DefaultAuthBuilder(c.endpoint.User()) + c.auth, err = DefaultAuthBuilder(c.endpoint.User) return err } -func endpointToCommand(cmd string, ep transport.Endpoint) string { - return fmt.Sprintf("%s '%s'", cmd, ep.Path()) +func endpointToCommand(cmd string, ep *transport.Endpoint) string { + return fmt.Sprintf("%s '%s'", cmd, ep.Path) } func overrideConfig(overrides *ssh.ClientConfig, c *ssh.ClientConfig) { diff --git a/plumbing/transport/ssh/upload_pack_test.go b/plumbing/transport/ssh/upload_pack_test.go index 04f7b1c..f6696d1 100644 --- a/plumbing/transport/ssh/upload_pack_test.go +++ b/plumbing/transport/ssh/upload_pack_test.go @@ -58,7 +58,7 @@ func (s *UploadPackSuite) SetUpSuite(c *C) { }() } -func (s *UploadPackSuite) prepareRepository(c *C, f *fixtures.Fixture, name string) transport.Endpoint { +func (s *UploadPackSuite) prepareRepository(c *C, f *fixtures.Fixture, name string) *transport.Endpoint { fs := f.DotGit() err := fixtures.EnsureIsBare(fs) @@ -71,7 +71,7 @@ func (s *UploadPackSuite) prepareRepository(c *C, f *fixtures.Fixture, name stri return s.newEndpoint(c, name) } -func (s *UploadPackSuite) newEndpoint(c *C, name string) transport.Endpoint { +func (s *UploadPackSuite) newEndpoint(c *C, name string) *transport.Endpoint { ep, err := transport.NewEndpoint(fmt.Sprintf( "ssh://git@localhost:%d/%s/%s", s.port, filepath.ToSlash(s.base), name, )) |