From c45e4e614ac5174d90158b51b79bf44bbe725d66 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 2 May 2013 11:39:11 +0300
Subject: [PATCH] Git: Do not return empty string for top commit in
LogChangeDialog
Change-Id: I26cff005974102c037bbbff04b7606e7f8a07b84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gitplugin.cpp | 7 ++-----
src/plugins/git/logchangedialog.cpp | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index c41715b5013..64a52fd68de 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 2bf627be360..23e32339701 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();
}
--
GitLab