Merge pull request #554 from strib/strib/fix-win-cmd-lookup

mcuadros · web-flow · commit bff1d06e40f7 · 2017-08-28T09:46:38.000+02:00
plumbing: use LookPath instead of Stat to fix Windows executables
diff --git a/plumbing/transport/file/client.go b/plumbing/transport/file/client.go
@@ -66,7 +66,7 @@ func prefixExecPath(cmd string) (string, error) {
 	cmd = filepath.Join(execPath, cmd)
 
 	// Make sure it actually exists.
-	_, err = os.Stat(cmd)
+	_, err = exec.LookPath(cmd)
 	if err != nil {
 		return "", err
 	}
diff --git a/plumbing/transport/file/client_test.go b/plumbing/transport/file/client_test.go
@@ -33,7 +33,7 @@ func (s *ClientSuite) TestCommand(c *C) {
 
 	// Make sure we get an error for one that doesn't exist.
 	_, err = runner.Command("git-fake-command", ep, emptyAuth)
-	c.Assert(os.IsNotExist(err), Equals, true)
+	c.Assert(err, NotNil)
 }
 
 const bareConfig = `[core]

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func prefixExecPath(cmd string) (string, error) {`
`66`	`66`	`cmd = filepath.Join(execPath, cmd)`
`67`	`67`
`68`	`68`	`// Make sure it actually exists.`
`69`		`- _, err = os.Stat(cmd)`
	`69`	`+ _, err = exec.LookPath(cmd)`
`70`	`70`	`if err != nil {`
`71`	`71`	`return "", err`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (s ClientSuite) TestCommand(c C) {`
`33`	`33`
`34`	`34`	`// Make sure we get an error for one that doesn't exist.`
`35`	`35`	`_, err = runner.Command("git-fake-command", ep, emptyAuth)`
`36`		`- c.Assert(os.IsNotExist(err), Equals, true)`
	`36`	`+ c.Assert(err, NotNil)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	const bareConfig = `[core]