From: Frank Li <lznuaa@gmail.com>
Date: Tue, 28 Apr 2009 07:15:01 +0000 (+0800)
Subject: Issue 11:  Show differences as unified diff does not use selected item
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d8990cc78fcb3307bdd72251274065b60aab8efb;p=tortoisegit%2FTortoiseGitJp.git

Issue 11:  Show differences as unified diff does not use selected item

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

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