go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-13 22:17:05 +02:00
Code Issues Releases Activity

show stdout in error message if stderr is blank

Browse Source
This commit is contained in:
Jesse Duffield 2022-03-27 14:28:30 +11:00
parent 20ec6d98ad
commit 7128d822cb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/commands/oscommands/cmd_obj_runner.go
View File

@ -226,6 +226,9 @@ func (self *cmdObjRunner) runAndStreamAux(
return err return err
} }
var stdout bytes.Buffer
handler.stdoutPipe = io.TeeReader(handler.stdoutPipe, &stdout)
defer func() { defer func() {
if closeErr := handler.close(); closeErr != nil { if closeErr := handler.close(); closeErr != nil {
self.log.Error(closeErr) self.log.Error(closeErr)
@ -237,10 +240,14 @@ func (self *cmdObjRunner) runAndStreamAux(
err = cmd.Wait() err = cmd.Wait()
if err != nil { if err != nil {
errStr := stderr.String() errStr := stderr.String()
if cmdObj.ShouldIgnoreEmptyError() && errStr == "" { if errStr != "" {
return errors.New(errStr)
}
if cmdObj.ShouldIgnoreEmptyError() {
return nil return nil
} }
return errors.New(stderr.String()) return errors.New(stdout.String())
} }
return nil return nil