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

Git: Execute rebase asynchronously

Browse Source 
Rebase --continue might request an editor, which hangs if run
synchronously

Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-14 18:35:38 +03:00
committed by Orgad Shaneh
parent fc2a5d7f50
commit 096daac0bd
4 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/branchdialog.cpp
View File

@@ -303,7 +303,7 @@ void BranchDialog::rebase()
const QString baseBranch = m_model->branchName(idx);
GitClient *client = GitPlugin::instance()->gitClient();
if (client->beginStashScope(m_repository, QLatin1String("rebase")))
client->synchronousRebase(m_repository, baseBranch);
client->rebase(m_repository, baseBranch);
}
QModelIndex BranchDialog::selectedIndex()