go-git
diff --git a/‎plumbing/transport/git/common_test.go
Copy file name to clipboardExpand all lines: plumbing/transport/git/common_test.go
+10Lines changed: 10 additions & 0 deletions b/‎plumbing/transport/git/common_test.go
Copy file name to clipboardExpand all lines: plumbing/transport/git/common_test.go
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎plumbing/transport/internal/common/common.go
Copy file name to clipboardExpand all lines: plumbing/transport/internal/common/common.go
+3Lines changed: 3 additions & 0 deletions b/‎plumbing/transport/internal/common/common.go
Copy file name to clipboardExpand all lines: plumbing/transport/internal/common/common.go
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎plumbing/transport/test/receive_pack.go
Copy file name to clipboardExpand all lines: plumbing/transport/test/receive_pack.go
-1Lines changed: 0 additions & 1 deletion b/‎plumbing/transport/test/receive_pack.go
Copy file name to clipboardExpand all lines: plumbing/transport/test/receive_pack.go
-1Lines changed: 0 additions & 1 deletion
@@ -1,13 +1,15 @@
 package git
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"net"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"testing"
 	"time"
 
@@ -58,11 +60,19 @@ func (s *BaseSuite) StartDaemon(c *C) {
 	// Environment must be inherited in order to acknowledge GIT_EXEC_PATH if set.
 	s.daemon.Env = os.Environ()
 
+	stdErr := bytes.NewBufferString("")
+	s.daemon.Stderr = stdErr
+
 	err := s.daemon.Start()
+	// Note that if git daemon is not installed, err may still be nil
+	// but all transport/git tests will fail.
 	c.Assert(err, IsNil)
 
 	// Connections might be refused if we start sending request too early.
 	time.Sleep(time.Millisecond * 500)
+	if strings.Contains(stdErr.String(), "'daemon' is not a git command") {
+		c.Fatal("git daemon cannot be found")
+	}
 }
 
 func (s *BaseSuite) newEndpoint(c *C, name string) *transport.Endpoint {
 
@@ -360,6 +360,9 @@ func (s *session) finish() error {
 }
 
 func (s *session) Close() (err error) {
+	if s == nil {
+		return
+	}
 	err = s.finish()
 
 	defer ioutil.CheckClose(s.Command, &err)
 
@@ -1,6 +1,5 @@
 // Package test implements common test suite for different transport
 // implementations.
-//
 package test
 
 import (
Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,9 @@ func (s *session) finish() error {`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`func (s *session) Close() (err error) {`
	`363`	`+ if s == nil {`
	`364`	`+ return`
	`365`	`+ }`
`363`	`366`	`err = s.finish()`
`364`	`367`
`365`	`368`	`defer ioutil.CheckClose(s.Command, &err)`