OSDN Git Service

Issue 11: Show differences as unified diff does not use selected item
authorFrank Li <lznuaa@gmail.com>
Tue, 28 Apr 2009 07:15:01 +0000 (15:15 +0800)
committerFrank Li <lznuaa@gmail.com>
Tue, 28 Apr 2009 07:15:01 +0000 (15:15 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/AppUtils.cpp

index fa4627d..b731c98 100644 (file)
@@ -1023,11 +1023,18 @@ bool CAppUtils::StartShowUnifiedDiff(HWND hWnd, const CTGitPath& url1, const git
        CString cmd;\r
        if(rev1 == GitRev::GetWorkingCopy())\r
        {\r
-               cmd.Format(_T("git.exe diff --stat -p %s"),rev2);\r
+               cmd.Format(_T("git.exe diff --stat -p %s "),rev2);\r
        }else\r
        {       \r
                cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),rev1,rev2);\r
        }\r
+\r
+       if( !url1.IsEmpty() )\r
+       {\r
+               cmd+=_T(" \"");\r
+               cmd+=url1.GetGitPathString();\r
+               cmd+=_T("\" ");\r
+       }\r
        g_Git.RunLogFile(cmd,tempfile);\r
        CAppUtils::StartUnifiedDiffViewer(tempfile,rev1.Left(6)+_T(":")+rev2.Left(6));\r
 \r