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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	src/shared/qbs

Change-Id: Ic39fd1c411632f56312fae31c0c88ebc1098b5a4
This commit is contained in:
Eike Ziller
2017-01-30 10:55:40 +01:00
parent 28d9c305ad 2def95374d
commit b299ff19ec
10 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1062,10 +1062,12 @@ bool GitPlugin::submitEditorAboutToClose()
m_gitClient->interactiveRebase(m_submitRepository, amendSHA1, true);
} else {
m_gitClient->continueCommandIfNeeded(m_submitRepository);
if (editor->panelData().pushAction == NormalPush)
if (editor->panelData().pushAction == NormalPush) {
m_gitClient->push(m_submitRepository);
else if (editor->panelData().pushAction == PushToGerrit)
connect(editor, &QObject::destroyed, this, &GitPlugin::delayedPushToGerrit);
} else if (editor->panelData().pushAction == PushToGerrit) {
connect(editor, &QObject::destroyed, this, &GitPlugin::delayedPushToGerrit,
Qt::QueuedConnection);
}
}
return true;