feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Do not return empty string for top commit in LogChangeDialog

Browse Source 
Change-Id: I26cff005974102c037bbbff04b7606e7f8a07b84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-05-02 11:39:11 +03:00
committed by Orgad Shaneh
parent 9228587b8e
commit c45e4e614a
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/gitplugin.cpp
View File

@@ -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()

3
src/plugins/git/logchangedialog.cpp
View File

@@ -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();
}