diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 23 |
2 files changed, 19 insertions, 13 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 0c3c245eb1..aa4e2b48db 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -3046,6 +3046,15 @@ bool GitClient::getCommitData(const QString &workingDirectory, } commitData.enablePush = !synchronousRemotesList(repoDirectory).isEmpty(); + if (commitData.enablePush) { + switch (checkCommandInProgress(repoDirectory)) { + case GitClient::Rebase: + case GitClient::RebaseMerge: + commitData.enablePush = false; + break; + } + } + return true; } diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 7d0f918c74..ab195cde66 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1111,25 +1111,22 @@ bool GitPlugin::submitEditorAboutToClose() commitType, amendSHA1, m_commitMessageFileName, model); } - if (closeEditor) { - cleanCommitMessageFile(); - if (commitType == FixupCommit) { - if (!m_gitClient->beginStashScope(m_submitRepository, QLatin1String("Rebase-fixup"), NoPrompt)) - return false; - m_gitClient->interactiveRebase(m_submitRepository, amendSHA1, true); - } else { - m_gitClient->continueCommandIfNeeded(m_submitRepository); - } - } - - if (m_gitClient->checkCommandInProgress(m_submitRepository) == GitClient::NoCommand) { + if (!closeEditor) + return false; + cleanCommitMessageFile(); + if (commitType == FixupCommit) { + if (!m_gitClient->beginStashScope(m_submitRepository, QLatin1String("Rebase-fixup"), NoPrompt)) + return false; + m_gitClient->interactiveRebase(m_submitRepository, amendSHA1, true); + } else { + m_gitClient->continueCommandIfNeeded(m_submitRepository); if (editor->panelData().pushAction == NormalPush) m_gitClient->push(m_submitRepository); else if (editor->panelData().pushAction == PushToGerrit) connect(editor, SIGNAL(destroyed()), this, SLOT(delayedPushToGerrit())); } - return closeEditor; + return true; } void GitPlugin::fetch() |