Add Combine Commit to one commit at log list dialog

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / CommitDlg.cpp

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 7bf2c24..84220a7 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -33,6 +33,7 @@
 #include "CommonResource.h"\r
 #include "UnicodeUtils.h"\r
 #include "ProgressDlg.h"\r
+#include "ShellUpdater.h"\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
@@ -56,6 +57,7 @@ CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
        , m_itemsCount(0)\r
        , m_bSelectFilesForCommit(TRUE)\r
 {\r
+       this->m_bCommitAmend=FALSE;\r
 }\r
 \r
 CCommitDlg::~CCommitDlg()\r
@@ -283,9 +285,9 @@ BOOL CCommitDlg::OnInitDialog()
        }\r
        err = FALSE;\r
 \r
-       this->UpdateData(TRUE);\r
-       this->m_bCommitAmend=FALSE;\r
-       this->UpdateData(FALSE);\r
+       //this->UpdateData(TRUE);\r
+       //this->m_bCommitAmend=FALSE;\r
+       //this->UpdateData(FALSE);\r
 \r
        return FALSE;  // return TRUE unless you set the focus to a control\r
        // EXCEPTION: OCX Property Pages should return FALSE\r
@@ -406,6 +408,7 @@ void CCommitDlg::OnOK()
 \r
                        g_Git.Run(cmd,&out,CP_OEMCP);\r
                        nchecked++;\r
+\r
                        //checkedLists.insert(entry->GetGitPathString());\r
 //                     checkedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
                }\r
@@ -449,6 +452,8 @@ void CCommitDlg::OnOK()
                        }\r
 #endif\r
                }\r
+\r
+               CShellUpdater::Instance().AddPathForUpdate(*entry);\r
        }\r
 \r
        //if(uncheckedfiles.GetLength()>0)\r
@@ -626,6 +631,8 @@ void CCommitDlg::OnOK()
        SaveSplitterPos();\r
 \r
        CResizableStandAloneDialog::OnOK();\r
+\r
+       CShellUpdater::Instance().Flush();\r
 }\r
 \r
 void CCommitDlg::SaveSplitterPos()\r