1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00

Made tests pass

Git constandly exits with error code 1 for some reason it might be because of the wrong username and password but i don't think error 1 is for wrong credentials
This commit is contained in:
mjarkk
2018-10-27 15:32:12 +02:00
parent 45c249acca
commit 6c1c110ce0
3 changed files with 13 additions and 11 deletions

View File

@ -67,14 +67,13 @@ func (c *OSCommand) RunCommandWithOutputLive(command string, output func(string)
// The ask argument will be "username" or "password" and expects the user's password or username back
func (c *OSCommand) DetectUnamePass(command string, ask func(string) string) error {
ttyText := ""
errors := []error{}
err := c.RunCommandWithOutputLive(command, func(word string) string {
ttyText = ttyText + " " + word
// detect username question
detectUname, err := regexp.MatchString(`Username\s*for\s*'.+':`, ttyText)
if err != nil {
errors = append(errors, err)
return "-"
}
if detectUname {
// reset the text and return the user's username
@ -85,7 +84,7 @@ func (c *OSCommand) DetectUnamePass(command string, ask func(string) string) err
// detect password question
detectPass, err := regexp.MatchString(`Password\s*for\s*'.+':`, ttyText)
if err != nil {
errors = append(errors, err)
return "-"
}
if detectPass {
// reset the text and return the user's username
@ -97,9 +96,6 @@ func (c *OSCommand) DetectUnamePass(command string, ask func(string) string) err
if err != nil {
return err
}
if len(errors) > 0 {
return errors[0]
}
return nil
}