From 161b016aa12a1e60a85c2893e733196323822193 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 10 Jun 2013 18:39:29 +0300 Subject: Git: Fix title for Fixup Commit Change-Id: I9d2e9f76a165a57588c29bc1db1a087fc7cb441b Reviewed-by: Tobias Hunger --- src/plugins/git/gitplugin.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/plugins/git/gitplugin.cpp') diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index a6818aa883..b3d8562d11 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -987,7 +987,17 @@ Core::IEditor *GitPlugin::openSubmitEditor(const QString &fileName, const Commit submitEditor->registerActions(m_undoAction, m_redoAction, m_submitCurrentAction, m_diffSelectedFilesAction); submitEditor->setCommitData(cd); submitEditor->setCheckScriptWorkingDirectory(m_submitRepository); - const QString title = (cd.commitType == AmendCommit) ? tr("Amend %1").arg(cd.amendSHA1) : tr("Git Commit"); + QString title; + switch (cd.commitType) { + case AmendCommit: + title = tr("Amend %1").arg(cd.amendSHA1); + break; + case FixupCommit: + title = tr("Git Fixup Commit"); + break; + default: + title = tr("Git Commit"); + } submitEditor->setDisplayName(title); connect(submitEditor, SIGNAL(diff(QStringList,QStringList)), this, SLOT(submitEditorDiff(QStringList,QStringList))); connect(submitEditor, SIGNAL(merge(QStringList)), this, SLOT(submitEditorMerge(QStringList))); -- cgit v1.2.1