sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

always hide rather than delete the credentials view, and don't log on error in case there is a user password in the error

Browse Source
This commit is contained in:
Jesse Duffield
2018-12-16 17:05:34 +11:00
parent af26b5f3e0
commit 4886b8350e
5 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/commands/exec_live_default.go
View File

@ -47,9 +47,9 @@ func RunCommandWithOutputLiveWrapper(c *OSCommand, command string, output func(s
cmdOutput = append(cmdOutput, toOutput)
toWrite := output(toOutput)
if len(toWrite) > 0 {
// don't do -1 because the next value is the username / password
// don't do len(cmdOutput)-1 because the next value is the username / password
cmdOutputOffset = len(cmdOutput)
_, _ = tty.Write([]byte(toWrite + "\n"))
_, _ = tty.WriteString(toWrite + "\n")
}
}
waitForBufio.Done()
@ -59,8 +59,8 @@ func RunCommandWithOutputLiveWrapper(c *OSCommand, command string, output func(s
tty.Close()
if err != nil {
waitForBufio.Wait()
if len(cmdOutput) == cmdOutputOffset {
cmdOutputOffset--
if cmdOutputOffset > len(cmdOutput)-1 {
cmdOutputOffset = len(cmdOutput) - 1
}
return errors.New(err.Error() + ", " + strings.Join(cmdOutput[cmdOutputOffset:], " "))
}

2
pkg/commands/os.go
View File

@ -217,7 +217,7 @@ func (c *OSCommand) CreateTempFile(filename, content string) (string, error) {
return "", err
}
if _, err := tmpfile.Write([]byte(content)); err != nil {
if _, err := tmpfile.WriteString(content); err != nil {
c.Log.Error(err)
return "", err
}