From: Frank Li <lznuaa@gmail.com>
Date: Thu, 29 Jan 2009 08:38:49 +0000 (+0800)
Subject: Fix Compare with preview version crash problem at log dialog.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f37370ce639f772be0bd96f7a9867a64b41c96a;p=tortoisegit%2FTortoiseGitJp.git

Fix Compare with preview version crash problem at log dialog.

The reason is we use new "-z" option to parser git log output.

Signed-off-by: Frank Li <lznuaa@gmail.com>
---

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