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

Git: Fix canceling interactive rebase

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

Change-Id: I6292c700f61e5d075953ecc371d0916342096801
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-04-27 22:52:58 +02:00
parent 571672c414
commit 3ce2b605d9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/git/gitplugin.cpp
+2 -2
View File
@@ -758,9 +758,9 @@ void GitPlugin::startRebase()
dialog.setWindowTitle(tr("Interactive Rebase")); dialog.setWindowTitle(tr("Interactive Rebase"));
if (!dialog.runDialog(workingDirectory)) if (!dialog.runDialog(workingDirectory))
return; return;
const QString change = dialog.commit() + QLatin1Char('^'); const QString change = dialog.commit();
if (!change.isEmpty()) if (!change.isEmpty())
m_gitClient->interactiveRebase(workingDirectory, change); m_gitClient->interactiveRebase(workingDirectory, change + QLatin1Char('^'));
} }
void GitPlugin::startChangeRelatedAction() void GitPlugin::startChangeRelatedAction()