aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/transport/file
diff options
context:
space:
mode:
Diffstat (limited to 'plumbing/transport/file')
-rw-r--r--plumbing/transport/file/client.go10
-rw-r--r--plumbing/transport/file/upload_pack_test.go6
2 files changed, 15 insertions, 1 deletions
diff --git a/plumbing/transport/file/client.go b/plumbing/transport/file/client.go
index b6d60c1..0b42abf 100644
--- a/plumbing/transport/file/client.go
+++ b/plumbing/transport/file/client.go
@@ -30,7 +30,9 @@ func NewClient(uploadPackBin, receivePackBin string) transport.Transport {
})
}
-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) {
+
switch cmd {
case transport.UploadPackServiceName:
cmd = r.UploadPackBin
@@ -72,6 +74,11 @@ func (c *command) StdoutPipe() (io.Reader, error) {
return c.cmd.StdoutPipe()
}
+func (c *command) Kill() error {
+ c.cmd.Process.Kill()
+ return c.Close()
+}
+
// Close waits for the command to exit.
func (c *command) Close() error {
if c.closed {
@@ -81,6 +88,7 @@ func (c *command) Close() error {
defer func() {
c.closed = true
_ = c.stderrCloser.Close()
+
}()
err := c.cmd.Wait()
diff --git a/plumbing/transport/file/upload_pack_test.go b/plumbing/transport/file/upload_pack_test.go
index f894935..9a922d1 100644
--- a/plumbing/transport/file/upload_pack_test.go
+++ b/plumbing/transport/file/upload_pack_test.go
@@ -78,3 +78,9 @@ func (s *UploadPackSuite) TestNonExistentCommand(c *C) {
c.Assert(err, ErrorMatches, ".*file.*")
c.Assert(session, IsNil)
}
+
+func (s *UploadPackSuite) TestUploadPackWithContextOnRead(c *C) {
+ // TODO: Fix race condition when Session.Close and the read failed due to a
+ // canceled context when the packfile is being read.
+ c.Skip("UploadPack has a race condition when we Close the session")
+}