feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Prevent checking unmerged files in submit editor

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -72,7 +72,14 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
it != d.files.constEnd(); ++it) {
const FileStates state = it->first;
const QString file = it->second;
m_model->addFile(file, CommitData::stateDisplayName(state), state & StagedFile,
VcsBase::CheckMode checkMode;
if (state & UnmergedFile)
checkMode = VcsBase::Uncheckable;
else if (state & StagedFile)
checkMode = VcsBase::Checked;
else
checkMode = VcsBase::Unchecked;
m_model->addFile(file, CommitData::stateDisplayName(state), checkMode,
QVariant(static_cast<int>(state)));
}
}