diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-06-14 18:35:38 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-06-17 10:56:05 +0200 |
| commit | 096daac0bd06e4adbfd176976c586bb8fc078531 (patch) | |
| tree | 7a0290a4eebfd9f6041b8f791bc9819ed3e0d8c1 /src/plugins/git/gitplugin.cpp | |
| parent | fc2a5d7f5064cf6eec8b2f4c7f65bc3cfdd231ce (diff) | |
| download | qt-creator-096daac0bd06e4adbfd176976c586bb8fc078531.tar.gz | |
Git: Execute rebase asynchronously
Rebase --continue might request an editor, which hangs if run
synchronously
Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 6f051f9af3..65a0f91f2b 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1149,13 +1149,13 @@ void GitPlugin::continueOrAbortCommand() if (action == m_abortMergeAction) m_gitClient->synchronousMerge(state.topLevel(), QLatin1String("--abort")); else if (action == m_abortRebaseAction) - m_gitClient->synchronousRebase(state.topLevel(), QLatin1String("--abort")); + m_gitClient->rebase(state.topLevel(), QLatin1String("--abort")); else if (action == m_abortCherryPickAction) m_gitClient->synchronousCherryPick(state.topLevel(), QLatin1String("--abort")); else if (action == m_abortRevertAction) m_gitClient->synchronousRevert(state.topLevel(), QLatin1String("--abort")); else if (action == m_continueRebaseAction) - m_gitClient->synchronousRebase(state.topLevel(), QLatin1String("--continue")); + m_gitClient->rebase(state.topLevel(), QLatin1String("--continue")); else if (action == m_continueCherryPickAction) m_gitClient->synchronousCherryPick(state.topLevel(), QLatin1String("--continue")); else if (action == m_continueRevertAction) |