From c86e55411ebdb67d00f2f0295570bc00c76f3435 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Oct 2012 16:35:07 +0200 Subject: [PATCH] Only save history if the commit message isn't empty Signed-off-by: Sven Strickroth --- src/TortoiseProc/CommitDlg.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index d77e48732..2bcf1695a 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -860,8 +860,11 @@ void CCommitDlg::OnOK() m_bKeepChangeList = FALSE; InterlockedExchange(&m_bBlock, FALSE); - m_History.AddEntry(m_sLogMessage); - m_History.Save(); + if (!m_sLogMessage.IsEmpty()) + { + m_History.AddEntry(m_sLogMessage); + m_History.Save(); + } SaveSplitterPos(); @@ -1134,9 +1137,11 @@ void CCommitDlg::OnCancel() else m_sLogMessage = sBugID + _T("\n") + m_sLogMessage; } - if (m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0) + if ((m_ProjectProperties.sLogTemplate.Compare(m_sLogMessage) != 0) && !m_sLogMessage.IsEmpty()) + { m_History.AddEntry(m_sLogMessage); - m_History.Save(); + m_History.Save(); + } RestoreFiles(); SaveSplitterPos(); CResizableStandAloneDialog::OnCancel(); -- 2.11.4.GIT