diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-06-10 18:39:29 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-06-11 12:32:07 +0200 |
| commit | 161b016aa12a1e60a85c2893e733196323822193 (patch) | |
| tree | b1d772fd9f490f74f045a550c8be6999f3c495e3 /src/plugins/git/gitplugin.cpp | |
| parent | 5e005443ebfc13468e0f315f2aa283ce78c030f2 (diff) | |
| download | qt-creator-161b016aa12a1e60a85c2893e733196323822193.tar.gz | |
Git: Fix title for Fixup Commit
Change-Id: I9d2e9f76a165a57588c29bc1db1a087fc7cb441b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
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))); |