Git: Do not pass --author on commit when author is unchanged

Change-Id: Ic77961ad9e426353d662e0d61eebdaba6bc2cf4d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 58b8693199..e234370f90 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -127,8 +127,12 @@ void GitSubmitEditorWidget::refreshLog(const QString &repository)
 GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
 {
     GitSubmitEditorPanelData rc;
-    rc.author = m_gitSubmitPanelUi.authorLineEdit->text();
-    rc.email = m_gitSubmitPanelUi.emailLineEdit->text();
+    const QString author = m_gitSubmitPanelUi.authorLineEdit->text();
+    const QString email = m_gitSubmitPanelUi.emailLineEdit->text();
+    if (author != m_originalAuthor || email != m_originalEmail) {
+        rc.author = author;
+        rc.email = email;
+    }
     rc.bypassHooks = m_gitSubmitPanelUi.bypassHooksCheckBox->isChecked();
     rc.pushAction = m_pushAction;
     return rc;
@@ -136,6 +140,8 @@ GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
 
 void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
 {
+    m_originalAuthor = data.author;
+    m_originalEmail = data.email;
     m_gitSubmitPanelUi.authorLineEdit->setText(data.author);
     m_gitSubmitPanelUi.emailLineEdit->setText(data.email);
     m_gitSubmitPanelUi.bypassHooksCheckBox->setChecked(data.bypassHooks);