From 3cefd0288e24200fdee279c7ca855461ccdea525 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 2 Jul 2013 22:59:23 +0300 Subject: [PATCH] Git: Remove wrong assertions Changed in 89523c14 Change-Id: I872c37633a877e982046b2a44266159d86defbde Reviewed-by: Eike Ziller Reviewed-by: Petar Perisin Reviewed-by: hjk --- src/plugins/git/branchdialog.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 37a7d331736..d7403dd1065 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -293,8 +293,7 @@ void BranchDialog::log() void BranchDialog::merge() { QModelIndex idx = selectedIndex(); - QTC_CHECK(m_model->isLocal(m_model->currentBranch())); // otherwise the button would not be enabled! - QTC_CHECK(idx != m_model->currentBranch()); // otherwise the button would not be enabled! + QTC_CHECK(idx != m_model->currentBranch()); // otherwise the button would not be enabled! const QString branch = m_model->branchName(idx); GitClient *client = GitPlugin::instance()->gitClient(); @@ -305,8 +304,7 @@ void BranchDialog::merge() void BranchDialog::rebase() { QModelIndex idx = selectedIndex(); - QTC_CHECK(m_model->isLocal(m_model->currentBranch())); // otherwise the button would not be enabled! - QTC_CHECK(idx != m_model->currentBranch()); // otherwise the button would not be enabled! + QTC_CHECK(idx != m_model->currentBranch()); // otherwise the button would not be enabled! const QString baseBranch = m_model->branchName(idx); GitClient *client = GitPlugin::instance()->gitClient();