diff options
| author | Petar Perisin <petar.perisin@gmail.com> | 2013-09-30 01:46:10 +0200 |
|---|---|---|
| committer | Petar Perisin <petar.perisin@gmail.com> | 2013-11-08 12:42:08 +0100 |
| commit | 6c61559399ae43a9c6ae7cd9fd51185c135968a2 (patch) | |
| tree | 157c42a553e7d3de86ee0c337454bda4e97c73dd /src/plugins/git/gitplugin.cpp | |
| parent | abfa553986923613fb8147f6663bc9773edded9c (diff) | |
| download | qt-creator-6c61559399ae43a9c6ae7cd9fd51185c135968a2.tar.gz | |
Git: Allow push after fixup
Direct push after fixup is really useful, especially on gerrit, because
it allows easy fixing and direct pushing commits under HEAD.
Change-Id: I83980e451c9ae86ac1ac0a55170d6d4141f27d49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 06ed7d2ca9..f055c3f4b3 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1132,8 +1132,10 @@ bool GitPlugin::submitEditorAboutToClose() return false; cleanCommitMessageFile(); if (commitType == FixupCommit) { - if (!m_gitClient->beginStashScope(m_submitRepository, QLatin1String("Rebase-fixup"), NoPrompt)) + if (!m_gitClient->beginStashScope(m_submitRepository, QLatin1String("Rebase-fixup"), + NoPrompt, editor->panelData().pushAction)) { return false; + } m_gitClient->interactiveRebase(m_submitRepository, amendSHA1, true); } else { m_gitClient->continueCommandIfNeeded(m_submitRepository); @@ -1506,6 +1508,11 @@ GitClient *GitPlugin::gitClient() const return m_gitClient; } +Gerrit::Internal::GerritPlugin *GitPlugin::gerritPlugin() const +{ + return m_gerritPlugin; +} + #ifdef WITH_TESTS #include <QTest> |