From f6fb4f559e1619c6b478d88c3706e72bc315e2ac Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Tue, 18 Jul 2017 23:41:46 +0200 Subject: plumbing: server, fix loader in windows --- plumbing/transport/server/loader.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'plumbing/transport') diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go index d4eccd4..a7ed0dc 100644 --- a/plumbing/transport/server/loader.go +++ b/plumbing/transport/server/loader.go @@ -5,12 +5,14 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/transport" "gopkg.in/src-d/go-git.v4/storage/filesystem" + "fmt" + "gopkg.in/src-d/go-billy.v3" "gopkg.in/src-d/go-billy.v3/osfs" ) // DefaultLoader is a filesystem loader ignoring host and resolving paths to /. -var DefaultLoader = NewFilesystemLoader(osfs.New("/")) +var DefaultLoader = NewFilesystemLoader(osfs.New("")) // Loader loads repository's storer.Storer based on an optional host and a path. type Loader interface { @@ -40,6 +42,7 @@ func (l *fsLoader) Load(ep transport.Endpoint) (storer.Storer, error) { } if _, err := fs.Stat("config"); err != nil { + fmt.Println(ep.Path(), err) return nil, transport.ErrRepositoryNotFound } -- cgit From ae80735ce2171aff4c44313b3c27eb5ddb595385 Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Tue, 18 Jul 2017 23:51:09 +0200 Subject: plumbing: transport git fix test on windows --- plumbing/transport/git/receive_pack_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plumbing/transport') diff --git a/plumbing/transport/git/receive_pack_test.go b/plumbing/transport/git/receive_pack_test.go index 326ef1b..f9afede 100644 --- a/plumbing/transport/git/receive_pack_test.go +++ b/plumbing/transport/git/receive_pack_test.go @@ -99,9 +99,11 @@ func (s *ReceivePackSuite) SetUpTest(c *C) { } func (s *ReceivePackSuite) TearDownTest(c *C) { - err := s.daemon.Process.Signal(os.Interrupt) + err := s.daemon.Process.Signal(os.Kill) c.Assert(err, IsNil) + _ = s.daemon.Wait() + err = os.RemoveAll(s.base) c.Assert(err, IsNil) } -- cgit From 4a7e7cddc0e4f88085b263693c87635254de7f35 Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Wed, 19 Jul 2017 22:04:23 +0200 Subject: plumbing: transport server, remove letfover --- plumbing/transport/server/loader.go | 3 --- 1 file changed, 3 deletions(-) (limited to 'plumbing/transport') diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go index a7ed0dc..028ead4 100644 --- a/plumbing/transport/server/loader.go +++ b/plumbing/transport/server/loader.go @@ -5,8 +5,6 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/transport" "gopkg.in/src-d/go-git.v4/storage/filesystem" - "fmt" - "gopkg.in/src-d/go-billy.v3" "gopkg.in/src-d/go-billy.v3/osfs" ) @@ -42,7 +40,6 @@ func (l *fsLoader) Load(ep transport.Endpoint) (storer.Storer, error) { } if _, err := fs.Stat("config"); err != nil { - fmt.Println(ep.Path(), err) return nil, transport.ErrRepositoryNotFound } -- cgit