diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index c41715b5013c8d34c25261dc2520857c999a67de..64a52fd68de7720d2ff8c31a273b96146d676485 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -769,11 +769,8 @@ void GitPlugin::startRebase() return; LogChangeDialog dialog(false); dialog.setWindowTitle(tr("Interactive Rebase")); - if (!dialog.runDialog(workingDirectory, QString(), false)) - return; - const QString change = dialog.commit(); - if (!change.isEmpty()) - m_gitClient->interactiveRebase(workingDirectory, change, *stashGuard.take(), false); + if (dialog.runDialog(workingDirectory, QString(), false)) + m_gitClient->interactiveRebase(workingDirectory, dialog.commit(), *stashGuard.take(), false); } void GitPlugin::startChangeRelatedAction() diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index 2bf627be3601a88e1948eb4ec3227c9f465c868c..23e323397012e904a88420411c7aa1f8d5a42b06 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -76,9 +76,8 @@ bool LogChangeWidget::init(const QString &repository, const QString &commit, boo QString LogChangeWidget::commit() const { - // Return Sha1, or empty for top commit. if (const QStandardItem *sha1Item = currentItem(Sha1Column)) - return sha1Item->row() ? sha1Item->text() : QString(); + return sha1Item->text(); return QString(); }