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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
This commit is contained in:
Eike Ziller
2018-11-19 09:48:28 +01:00
parent 40ad7ec995 e164717108
commit 3d1d9aae2e
110 changed files with 2004 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/branchview.cpp
View File

@@ -318,14 +318,16 @@ bool BranchView::add()
branchAddDialog.setTrackedBranchName(isTracked ? trackedBranch : QString(), !isLocal);
if (branchAddDialog.exec() == QDialog::Accepted) {
QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(), trackedIndex);
QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(),
trackedIndex);
if (!idx.isValid())
return false;
QModelIndex mappedIdx = m_filterModel->mapFromSource(idx);
QTC_ASSERT(m_branchView, return false);
m_branchView->selectionModel()->select(idx, QItemSelectionModel::Clear
m_branchView->selectionModel()->select(mappedIdx, QItemSelectionModel::Clear
| QItemSelectionModel::Select
| QItemSelectionModel::Current);
m_branchView->scrollTo(idx);
m_branchView->scrollTo(mappedIdx);
if (QMessageBox::question(this, tr("Checkout"), tr("Checkout branch?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
return checkout();

3
src/plugins/git/gitclient.cpp
View File

@@ -2727,7 +2727,8 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
arguments << "--signoff";
}
const SynchronousProcessResponse resp = vcsFullySynchronousExec(repositoryDirectory, arguments);
const SynchronousProcessResponse resp = vcsSynchronousExec(repositoryDirectory, arguments,
VcsCommand::NoFullySync);
const QString stdErr = resp.stdErr();
if (resp.result == SynchronousProcessResponse::Finished) {
VcsOutputWindow::appendMessage(msgCommitted(amendSHA1, commitCount));