Fixed issue #144: Attaching message to a merge

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / MergeCommand.cpp

diff --git a/src/TortoiseProc/Commands/MergeCommand.cpp b/src/TortoiseProc/Commands/MergeCommand.cpp
index ff5a530..c4ff691 100644 (file)
--- a/src/TortoiseProc/Commands/MergeCommand.cpp
+++ b/src/TortoiseProc/Commands/MergeCommand.cpp
@@ -30,6 +30,7 @@ bool MergeCommand::Execute()
                CString cmd;\r
                CString noff;\r
                CString squash;\r
+               CString msg;\r
 \r
                if(dlg.m_bNoFF)\r
                        noff=_T("--no-ff");\r
@@ -37,7 +38,12 @@ bool MergeCommand::Execute()
                if(dlg.m_bSquash)\r
                        squash=_T("--squash");\r
 \r
-               cmd.Format(_T("git.exe merge %s %s %s"),\r
+               if(!dlg.m_strLogMesage.IsEmpty())\r
+               {       \r
+                       msg+=_T("-m \"")+dlg.m_strLogMesage+_T("\"");\r
+               }\r
+               cmd.Format(_T("git.exe merge %s %s %s %s"),\r
+                       msg,\r
                        noff,\r
                        squash,\r
                        dlg.m_VersionName);\r