Commit 3ce2b605 authored by Petar Perisin's avatar Petar Perisin
Browse files

Git: Fix canceling interactive rebase



If the LogChangeDialog is closed without selecting any
commit, interactive rebase started with '^' as the commit.

Change-Id: I6292c700f61e5d075953ecc371d0916342096801
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 571672c4
......@@ -758,9 +758,9 @@ void GitPlugin::startRebase()
dialog.setWindowTitle(tr("Interactive Rebase"));
if (!dialog.runDialog(workingDirectory))
return;
const QString change = dialog.commit() + QLatin1Char('^');
const QString change = dialog.commit();
if (!change.isEmpty())
m_gitClient->interactiveRebase(workingDirectory, change);
m_gitClient->interactiveRebase(workingDirectory, change + QLatin1Char('^'));
}
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