Commit 4845dc77 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Git: Wait with stashing on interactive rebase until user approves

Change-Id: Ieb8d0cd0906cdf0ea7a37e60e92a263c359c7a41
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
parent 072d551c
......@@ -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()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment