BrowseRefs: Ref name prefix on wrong places removed

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

diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp
index fb89fc9..0bbf7fd 100644 (file)
--- a/src/TortoiseProc/FileDiffDlg.cpp
+++ b/src/TortoiseProc/FileDiffDlg.cpp
@@ -104,8 +104,16 @@ void CFileDiffDlg::SetDiff(CTGitPath * path, CString &hash1, CString &hash2)
                m_path1 = *path;\r
                m_path2 = *path;\r
        }\r
-       m_rev1.m_CommitHash = hash1;\r
-       m_rev2.m_CommitHash = hash2;\r
+       \r
+       BYTE_VECTOR logout;\r
+\r
+       g_Git.GetLog(logout,hash1,path,1,0);\r
+       m_rev1.ParserFromLog(logout);\r
+\r
+       logout.clear();\r
+\r
+       g_Git.GetLog(logout,hash2,path,1,0);\r
+       m_rev2.ParserFromLog(logout);\r
 }\r
 void CFileDiffDlg::SetDiff(CTGitPath * path, GitRev rev1)\r
 {\r
@@ -250,12 +258,12 @@ UINT CFileDiffDlg::DiffThread()
        {\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
-                       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
-               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"),m_rev2.m_CommitHash,rev1);\r
        }\r
 \r
        BYTE_VECTOR out;\r
@@ -881,8 +889,10 @@ void CFileDiffDlg::SetURLLabels()
        SetDlgItemText(IDC_FIRSTURL, m_rev1.m_Subject+CString(_T("\r\n"))+m_rev1.m_CommitHash);\r
        SetDlgItemText(IDC_SECONDURL,m_rev2.m_Subject+CString(_T("\r\n"))+m_rev2.m_CommitHash);\r
 \r
-       m_tooltips.AddTool(IDC_FIRSTURL,  m_rev1.m_AuthorDate.Format(_T("%Y-%m-%d  "))+m_rev1.m_AuthorName);\r
-       m_tooltips.AddTool(IDC_SECONDURL, m_rev2.m_AuthorDate.Format(_T("%Y-%m-%d  "))+m_rev2.m_AuthorName);\r
+       m_tooltips.AddTool(IDC_FIRSTURL,  \r
+               CAppUtils::FormatDateAndTime( m_rev1.m_AuthorDate, DATE_SHORTDATE, false )+_T("  ")+m_rev1.m_AuthorName);\r
+       m_tooltips.AddTool(IDC_SECONDURL, \r
+               CAppUtils::FormatDateAndTime( m_rev2.m_AuthorDate, DATE_SHORTDATE, false )+_T("  ")+m_rev2.m_AuthorName);\r
 \r
 }\r
 \r