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

Git: Wait with stashing on interactive rebase until user approves

Browse Source 
Change-Id: Ieb8d0cd0906cdf0ea7a37e60e92a263c359c7a41
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-12-05 09:16:26 +02:00
committed by Orgad Shaneh
parent 072d551c73
commit 4845dc77ee
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -854,15 +854,13 @@ void GitPlugin::startRebase()
const QString topLevel = state.topLevel();
if (topLevel.isEmpty() || !m_gitClient->canRebase(topLevel))
return;
if (!m_gitClient->beginStashScope(topLevel, QLatin1String("Rebase-i")))
return;
LogChangeDialog dialog(false, Core::ICore::mainWindow());
RebaseItemDelegate delegate(dialog.widget());
dialog.setWindowTitle(tr("Interactive Rebase"));
if (dialog.runDialog(topLevel, QString(), false))
if (!dialog.runDialog(topLevel, QString(), false))
return;
if (m_gitClient->beginStashScope(topLevel, QLatin1String("Rebase-i")))
m_gitClient->interactiveRebase(topLevel, dialog.commit(), false);
else
m_gitClient->endStashScope(topLevel);
}
void GitPlugin::startChangeRelatedAction()