Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 6 insertions, 9 deletions

diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index f055c3f4b3..ae52a8a085 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -807,12 +807,11 @@ class ResetItemDelegate : public LogItemDelegate
 {
 public:
     ResetItemDelegate(LogChangeWidget *widget) : LogItemDelegate(widget) {}
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+    void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const
     {
-        QStyleOptionViewItem o = option;
         if (index.row() < currentRow())
-            o.font.setStrikeOut(true);
-        QStyledItemDelegate::paint(painter, o, index);
+            option->font.setStrikeOut(true);
+        LogItemDelegate::initStyleOption(option, index);
     }
 };
 
@@ -855,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()