diff --git a/Gopkg.lock b/Gopkg.lock index f5ef4c76c..7168338ef 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -196,12 +196,12 @@ revision = "03e26ff3f1de2c1bc2205113c3aba661312eee00" [[projects]] - digest = "1:15416fd2b58d5b2dfa0bc99185cdff3a8f49e73e022291891cb8d5d820d9760d" + branch = "master" + digest = "1:a46c2f4863e5284ddb255c28750298e04bc8c0fc896bed6056e947673168b7be" name = "github.com/jesseduffield/pty" packages = ["."] pruneopts = "NUT" - revision = "db8e3cd836b82e82e0a9c8edc6896967dd31374f" - version = "v1.1.3" + revision = "02db52c7e406c7abec44c717a173c7715e4c1b62" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index 1f0b03cee..a645c905f 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -37,6 +37,10 @@ branch = "master" name = "github.com/jesseduffield/gocui" +[[constraint]] + branch = "master" + name = "github.com/jesseduffield/pty" + [[constraint]] name = "gopkg.in/src-d/go-git.v4" revision = "43d17e14b714665ab5bc2ecc220b6740779d733f" diff --git a/vendor/github.com/jesseduffield/pty/run.go b/vendor/github.com/jesseduffield/pty/run.go index 2d7f96119..dda19b760 100644 --- a/vendor/github.com/jesseduffield/pty/run.go +++ b/vendor/github.com/jesseduffield/pty/run.go @@ -33,9 +33,13 @@ func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) { return nil, err } } - c.Stdout = tty + if c.Stdout == nil { + c.Stdout = tty + } + if c.Stderr == nil { + c.Stderr = tty + } c.Stdin = tty - c.Stderr = tty if c.SysProcAttr == nil { c.SysProcAttr = &syscall.SysProcAttr{} }