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

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

Browse Source 
Change-Id: Ic77961ad9e426353d662e0d61eebdaba6bc2cf4d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-08-13 12:28:56 +03:00
committed by Orgad Shaneh
parent d9502470f3
commit e992b1a097
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -127,8 +127,12 @@ void GitSubmitEditorWidget::refreshLog(const QString &repository)
GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
{ {
GitSubmitEditorPanelData rc; GitSubmitEditorPanelData rc;
rc.author = m_gitSubmitPanelUi.authorLineEdit->text(); const QString author = m_gitSubmitPanelUi.authorLineEdit->text();
rc.email = m_gitSubmitPanelUi.emailLineEdit->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.bypassHooks = m_gitSubmitPanelUi.bypassHooksCheckBox->isChecked();
rc.pushAction = m_pushAction; rc.pushAction = m_pushAction;
return rc; return rc;
@@ -136,6 +140,8 @@ GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data) void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
{ {
m_originalAuthor = data.author;
m_originalEmail = data.email;
m_gitSubmitPanelUi.authorLineEdit->setText(data.author); m_gitSubmitPanelUi.authorLineEdit->setText(data.author);
m_gitSubmitPanelUi.emailLineEdit->setText(data.email); m_gitSubmitPanelUi.emailLineEdit->setText(data.email);
m_gitSubmitPanelUi.bypassHooksCheckBox->setChecked(data.bypassHooks); m_gitSubmitPanelUi.bypassHooksCheckBox->setChecked(data.bypassHooks);

2
src/plugins/git/gitsubmiteditorwidget.h
View File

@@ -100,6 +100,8 @@ private:
LogChangeWidget *m_logChangeWidget; LogChangeWidget *m_logChangeWidget;
Ui::GitSubmitPanel m_gitSubmitPanelUi; Ui::GitSubmitPanel m_gitSubmitPanelUi;
QValidator *m_emailValidator; QValidator *m_emailValidator;
QString m_originalAuthor;
QString m_originalEmail;
bool m_hasUnmerged; bool m_hasUnmerged;
bool m_isInitialized; bool m_isInitialized;
}; };