Fix when nothing commit, message box will show ask user enable "show unversion files"

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

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 9428018..60d7edc 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -346,15 +346,12 @@ void CCommitDlg::OnOK()
        CDWordArray arDeleted;\r
        //first add all the unversioned files the user selected\r
        //and check if all versioned files are selected\r
-       int nUnchecked = 0;\r
        int nchecked = 0;\r
        m_bRecursive = true;\r
        int nListItems = m_ListCtrl.GetItemCount();\r
 \r
        CTGitPathList itemsToAdd;\r
        CTGitPathList itemsToRemove;\r
-       bool bCheckedInExternal = false;\r
-       bool bHasConflicted = false;\r
        //std::set<CString> checkedLists;\r
        //std::set<CString> uncheckedLists;\r
 \r
@@ -663,6 +660,7 @@ UINT CCommitDlg::StatusThread()
        }\r
 #endif\r
     // Initialise the list control with the status of the files/folders below us\r
+       m_ListCtrl.Clear();\r
        BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
 \r
        //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
@@ -709,6 +707,7 @@ UINT CCommitDlg::StatusThread()
                        m_bShowUnversioned = TRUE;\r
                        GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);\r
                        DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;\r
+                       m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);\r
                        m_ListCtrl.Show(dwShow);\r
                }\r
        }\r
@@ -1475,7 +1474,8 @@ void CCommitDlg::OnBnClickedCommitAmend()
        {\r
                GitRev rev;\r
                BYTE_VECTOR vector;\r
-               g_Git.GetLog(vector,CString(_T("HEAD")),NULL,1);\r
+               CString head(_T("HEAD"));\r
+               g_Git.GetLog(vector,head,NULL,1);\r
                rev.ParserFromLog(vector);\r
                m_AmendStr=rev.m_Subject+_T("\n\n")+rev.m_Body;\r
        }\r