Git: Prevent checking unmerged files in submit editor

Change-Id: Ic226638a522ca92f61b8b6736a325c1cc747ff62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-25 19:38:07 +02:00
parent 30d548ea3a
commit 65b7874341
8 changed files with 28 additions and 13 deletions

View File

@@ -69,6 +69,6 @@ void CommitEditor::setFields(const QString &repositoryRoot,
m_fileModel = new VcsBase::SubmitFileModel(this);
foreach (const VcsBase::VcsBaseClient::StatusItem &item, repoStatus)
if (item.flags != QLatin1String("Unknown"))
m_fileModel->addFile(item.file, item.flags, true);
m_fileModel->addFile(item.file, item.flags);
setFileModel(m_fileModel, repositoryRoot);
}