diff options
Diffstat (limited to 'src/plugins/git/branchdialog.cpp')
| -rw-r--r-- | src/plugins/git/branchdialog.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index e57ff1bd0f..001664f2f2 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -104,15 +104,14 @@ void BranchDialog::enableButtons() const bool currentSelected = hasSelection && idx == m_model->currentBranch(); const bool isLocal = m_model->isLocal(idx); const bool isLeaf = m_model->isLeaf(idx); - const bool currentLocal = m_model->isLocal(m_model->currentBranch()); m_ui->removeButton->setEnabled(hasSelection && !currentSelected && isLocal && isLeaf); m_ui->renameButton->setEnabled(hasSelection && isLocal && isLeaf); m_ui->logButton->setEnabled(hasSelection && isLeaf); m_ui->diffButton->setEnabled(hasSelection && isLeaf); m_ui->checkoutButton->setEnabled(hasSelection && !currentSelected && isLeaf); - m_ui->rebaseButton->setEnabled(hasSelection && !currentSelected && isLeaf && currentLocal); - m_ui->mergeButton->setEnabled(hasSelection && !currentSelected && isLeaf && currentLocal); + m_ui->rebaseButton->setEnabled(hasSelection && !currentSelected && isLeaf); + m_ui->mergeButton->setEnabled(hasSelection && !currentSelected && isLeaf); } void BranchDialog::refresh() |