From 434c385af70189897ceb8def056e832271c093c9 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 15 Nov 2012 23:21:54 +0100 Subject: [PATCH] Fixed issue #1519: Quotes in notes break Merge command Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/AppUtils.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index d7f1aa8ec..50f2de6a8 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -39,6 +39,7 @@ Released: unreleased * Fixed issue #1516: SVN clone strips trailing slashes * Fixed issue #1486: Rebase/Cherry-pick Dialog conflict list fail to refresh the status of resolved deleted file * Fixed issue #1521: Directories with period at beginning are recognized as file extensions showing *.dir + * Fixed issue #1519: Quotes in notes break Merge command = Release 1.7.14.0 = Released: 2012-10-14 diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 4eaca493d..1b4aef3b0 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -2593,7 +2593,9 @@ BOOL CAppUtils::Merge(CString *commit) if(!dlg.m_strLogMesage.IsEmpty()) { - msg += _T("-m \"")+dlg.m_strLogMesage+_T("\""); + CString logmsg = dlg.m_strLogMesage; + logmsg.Replace(_T("\""), _T("\\\"")); + msg += _T("-m \"") + logmsg + _T("\""); } cmd.Format(_T("git.exe merge %s %s %s %s %s"), msg, -- 2.11.4.GIT