OSDN Git Service

Merge remove x86 build
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / CommitDlg.cpp
index 024ea20..8b06ab6 100644 (file)
@@ -32,6 +32,7 @@
 #include "Hooks.h"\r
 #include "CommonResource.h"\r
 #include "UnicodeUtils.h"\r
 #include "Hooks.h"\r
 #include "CommonResource.h"\r
 #include "UnicodeUtils.h"\r
+#include "ProgressDlg.h"\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
@@ -475,11 +476,14 @@ void CCommitDlg::OnOK()
                        amend=_T("--amend");\r
                }\r
                cmd.Format(_T("git.exe commit %s -F \"%s\""),amend, tempfile);\r
                        amend=_T("--amend");\r
                }\r
                cmd.Format(_T("git.exe commit %s -F \"%s\""),amend, tempfile);\r
-               g_Git.Run(cmd,&out,CP_OEMCP);\r
+               \r
+               CProgressDlg progress;\r
+               progress.m_GitCmd=cmd;\r
+               progress.m_bShowCommand = FALSE;        // don't show the commit command\r
+               progress.m_PreText = out;                       // show any output already generated in log window\r
+               progress.DoModal();\r
        \r
                CFile::Remove(tempfile);\r
        \r
                CFile::Remove(tempfile);\r
-\r
-               CMessageBox::Show(this->m_hWnd, out, _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);\r
        }else\r
                CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);\r
 #if 0\r
        }else\r
                CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);\r
 #if 0\r