forked from qt-creator/qt-creator
Vcs: Proliferate FilePath a bit further
Change-Id: I8490917bf0bde59b1cef2509ec14c3ca985fa43d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -115,10 +115,8 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
|
||||
setEmptyFileListEnabled(m_commitType == AmendCommit); // Allow for just correcting the message
|
||||
|
||||
m_model = new GitSubmitFileModel(this);
|
||||
m_model->setRepositoryRoot(d.panelInfo.repository.toString());
|
||||
m_model->setFileStatusQualifier([](const QString &, const QVariant &extraData)
|
||||
-> SubmitFileModel::FileStatusHint
|
||||
{
|
||||
m_model->setRepositoryRoot(d.panelInfo.repository);
|
||||
m_model->setFileStatusQualifier([](const QString &, const QVariant &extraData) {
|
||||
const FileStates state = static_cast<FileStates>(extraData.toInt());
|
||||
if (state & (UnmergedFile | UnmergedThem | UnmergedUs))
|
||||
return SubmitFileModel::FileUnmerged;
|
||||
|
||||
Reference in New Issue
Block a user