From 89523c14679d90535dba4f98dacc8302edfa9802 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 12 Jun 2013 11:05:56 +0300 Subject: [PATCH] Git: Allow merge and rebase for detached HEAD Change-Id: Ia00c061b1f4a705cf815052921e6f6cf43d0867d Reviewed-by: Petar Perisin Reviewed-by: Tobias Hunger --- src/plugins/git/branchdialog.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index e57ff1bd0fb..001664f2f20 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()