From 9f72e43fb148a74be6f4add53a5bcff784f72a58 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 14 Jun 2013 17:21:14 +0300
Subject: [PATCH] Git: Refresh log entries on fixup commit
Change-Id: Icd14c8916dc006874b77aa922b3f1c6746e0549c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gitsubmiteditor.cpp | 1 +
src/plugins/git/gitsubmiteditorwidget.cpp | 6 ++++++
src/plugins/git/gitsubmiteditorwidget.h | 1 +
3 files changed, 8 insertions(+)
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index c22de6c11da..a9177ff09cc 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -176,6 +176,7 @@ void GitSubmitEditor::updateFileModel()
CommitData data(m_commitType);
if (client->getCommitData(m_workingDirectory, &commitTemplate, data, &errorMessage)) {
setCommitData(data);
+ submitEditorWidget()->refreshLog(m_workingDirectory);
} else {
VcsBase::VcsBaseOutputWindow::instance()->append(errorMessage);
m_forceClose = true;
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 8d057d4a6d0..9e94200674b 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -102,6 +102,12 @@ void GitSubmitEditorWidget::initialize(CommitType commitType, const QString &rep
insertTopWidget(m_gitSubmitPanel);
}
+void GitSubmitEditorWidget::refreshLog(const QString &repository)
+{
+ if (m_logChangeWidget)
+ m_logChangeWidget->init(repository, QString(), false);
+}
+
GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
{
GitSubmitEditorPanelData rc;
diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h
index 7eff3d4c03f..36f80b52302 100644
--- a/src/plugins/git/gitsubmiteditorwidget.h
+++ b/src/plugins/git/gitsubmiteditorwidget.h
@@ -71,6 +71,7 @@ public:
QString amendSHA1() const;
void setHasUnmerged(bool e);
void initialize(CommitType commitType, const QString &repository);
+ void refreshLog(const QString &repository);
protected:
bool canSubmit() const;
--
GitLab