OSDN Git Service

Fix Compare with preview version crash problem at log dialog.
authorFrank Li <lznuaa@gmail.com>
Thu, 29 Jan 2009 08:38:49 +0000 (16:38 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 29 Jan 2009 08:38:49 +0000 (16:38 +0800)
The reason is we use new "-z" option to parser git log output.

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/FileDiffDlg.cpp
src/TortoiseProc/LogDlg.cpp

index fb89fc9..9beff4b 100644 (file)
@@ -250,12 +250,12 @@ UINT CFileDiffDlg::DiffThread()
        {\r
                rev1=+_T("");\r
                if(this->m_rev1.m_CommitHash == GIT_REV_ZERO)\r
        {\r
                rev1=+_T("");\r
                if(this->m_rev1.m_CommitHash == GIT_REV_ZERO)\r
-                       cmd.Format(_T("git.exe diff -r --raw -C -M --numstat  %s"),m_rev2.m_CommitHash);\r
+                       cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),m_rev2.m_CommitHash);\r
                else\r
                else\r
-                       cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat  %s"),m_rev1.m_CommitHash);\r
+                       cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),m_rev1.m_CommitHash);\r
        }else\r
        {\r
        }else\r
        {\r
-               cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat %s %s"),rev1,m_rev2.m_CommitHash);\r
+               cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev1,m_rev2.m_CommitHash);\r
        }\r
 \r
        BYTE_VECTOR out;\r
        }\r
 \r
        BYTE_VECTOR out;\r
index c78a09f..e2bb8a1 100644 (file)
@@ -216,7 +216,7 @@ BOOL CLogDlg::OnInitDialog()
        m_LogList.DeleteAllItems();\r
        m_LogList.InsertGitColumn();\r
 \r
        m_LogList.DeleteAllItems();\r
        m_LogList.InsertGitColumn();\r
 \r
-       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"));\r
+       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
 \r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 \r
 \r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 \r