go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-06 03:53:59 +02:00
Code Issues Releases Activity

potentially fix credentials issue

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-09 00:33:39 +10:00
parent 273aba38d4
commit d5504fa5d0
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/gui/credentials_panel.go
View File

@ -48,7 +48,7 @@ func (gui *Gui) handleSubmitCredential() error {
return err return err
} }
return gui.refreshSidePanels(refreshOptions{}) return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
} }
func (gui *Gui) handleCloseCredentialsView() error { func (gui *Gui) handleCloseCredentialsView() error {
@ -78,6 +78,7 @@ func (gui *Gui) handleCredentialsPopup(cmdErr error) {
if strings.Contains(errMessage, "Invalid username, password or passphrase") { if strings.Contains(errMessage, "Invalid username, password or passphrase") {
errMessage = gui.Tr.PassUnameWrong errMessage = gui.Tr.PassUnameWrong
} }
_ = gui.returnFromContext()
// we are not logging this error because it may contain a password or a passphrase // we are not logging this error because it may contain a password or a passphrase
_ = gui.createErrorPanel(errMessage) _ = gui.createErrorPanel(errMessage)
} else { } else {

4
pkg/gui/files_panel.go
View File

@ -729,6 +729,10 @@ func (gui *Gui) pushFiles() error {
// if we have pullables we'll ask if the user wants to force push // if we have pullables we'll ask if the user wants to force push
currentBranch := gui.currentBranch() currentBranch := gui.currentBranch()
if currentBranch == nil {
// need to wait for branches to refresh
return nil
}
if currentBranch.Pullables == "?" { if currentBranch.Pullables == "?" {
// see if we have this branch in our config with an upstream // see if we have this branch in our config with an upstream

2
pkg/gui/layout.go
View File

@ -355,10 +355,10 @@ func (gui *Gui) onInitialViewsCreation() error {
// popups. Ordering within this layer does not matter because there should // popups. Ordering within this layer does not matter because there should
// only be one popup shown at a time // only be one popup shown at a time
gui.Views.CommitMessage, gui.Views.CommitMessage,
gui.Views.Credentials,
gui.Views.Menu, gui.Views.Menu,
gui.Views.Suggestions, gui.Views.Suggestions,
gui.Views.Confirmation, gui.Views.Confirmation,
gui.Views.Credentials,
// this guy will cover everything else when it appears // this guy will cover everything else when it appears
gui.Views.Limit, gui.Views.Limit,