Only capture stderr of commands that don't have configured Stderr

mislav · mislav · commit 2616da04c469 · 2019-11-14T20:02:42.000+01:00
diff --git a/git/git.go b/git/git.go
@@ -33,7 +33,6 @@ func Dir() (string, error) {
 
 func WorkdirName() (string, error) {
 	toplevelCmd := exec.Command("git", "rev-parse", "--show-toplevel")
-	toplevelCmd.Stderr = nil
 	output, err := utils.PrepareCmd(toplevelCmd).Output()
 	dir := firstLine(output)
 	if dir == "" {
diff --git a/utils/prepare_cmd.go b/utils/prepare_cmd.go
@@ -38,6 +38,9 @@ func (c cmdWithStderr) Output() ([]byte, error) {
 	if os.Getenv("DEBUG") != "" {
 		fmt.Fprintf(os.Stderr, "%v\n", c.Cmd.Args)
 	}
+	if c.Cmd.Stderr != nil {
+		return c.Cmd.Output()
+	}
 	errStream := &bytes.Buffer{}
 	c.Cmd.Stderr = errStream
 	out, err := c.Cmd.Output()
@@ -51,6 +54,9 @@ func (c cmdWithStderr) Run() error {
 	if os.Getenv("DEBUG") != "" {
 		fmt.Fprintf(os.Stderr, "%v\n", c.Cmd.Args)
 	}
+	if c.Cmd.Stderr != nil {
+		return c.Cmd.Run()
+	}
 	errStream := &bytes.Buffer{}
 	c.Cmd.Stderr = errStream
 	err := c.Cmd.Run()
