From 57f705159078493cfe8bf60bac78b348e85c3e82 Mon Sep 17 00:00:00 2001 From: Ryooooooga Date: Sat, 4 Sep 2021 21:01:38 +0900 Subject: [PATCH] Fix deletion of unmerged branches in languages other than English --- pkg/gui/branches_panel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index d5438bc16..0d20b14fd 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -298,7 +298,7 @@ func (gui *Gui) deleteNamedBranch(selectedBranch *models.Branch, force bool) err handleConfirm: func() error { if err := gui.GitCommand.WithSpan(gui.Tr.Spans.DeleteBranch).DeleteBranch(selectedBranch.Name, force); err != nil { errMessage := err.Error() - if !force && strings.Contains(errMessage, "is not fully merged") { + if !force && strings.Contains(errMessage, "git branch -D ") { return gui.deleteNamedBranch(selectedBranch, true) } return gui.createErrorPanel(errMessage)