From c69e4f27cbbab0b2fd6f24374d00d6eaa85e830b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 13 Sep 2014 23:53:37 +0300 Subject: [PATCH] Git: Use the right commit from history before merge Task-number: QTCREATORBUG-12415 Change-Id: I6328c8b0e3579eeddae9051a9ac5c587426163fe Reviewed-by: Tobias Hunger --- src/plugins/git/changeselectiondialog.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 39c1c398ca..a333d39dd7 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -121,10 +121,7 @@ void ChangeSelectionDialog::selectCommitFromRecentHistory() if (dialog.result() == QDialog::Rejected || dialog.commitIndex() == -1) return; - if (dialog.commitIndex() > 0) - commit += QLatin1Char('~') + QString::number(dialog.commitIndex()); - - m_ui->changeNumberEdit->setText(commit); + m_ui->changeNumberEdit->setText(dialog.commit()); } void ChangeSelectionDialog::chooseWorkingDirectory() -- GitLab