From 6a87d8d347ced255dbe696cbcd475d7971d59627 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 15 Aug 2013 22:27:45 +0300 Subject: [PATCH] Git: Cancel adding a branch if the git operation fails e.g. If a branch with the chosen name already exists Change-Id: I22be3001ed68d6bf6f45d9180ad60403267d4ad9 Reviewed-by: Petar Perisin --- src/plugins/git/branchdialog.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 7ae877f64d..fe537736fb 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -160,6 +160,8 @@ void BranchDialog::add() if (branchAddDialog.exec() == QDialog::Accepted && m_model) { QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(), trackedIndex); + if (!idx.isValid()) + return; m_ui->branchView->selectionModel()->select(idx, QItemSelectionModel::Clear | QItemSelectionModel::Select | QItemSelectionModel::Current); -- GitLab