\r
BOOL EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData);\r
\r
- git_revnum_t GetHash(CString &friendname);\r
+ git_revnum_t GetHash(const CString &friendname);\r
\r
int BuildOutputFormat(CString &format,bool IsFull=TRUE);\r
//int GetShortLog(CString &log,CTGitPath * path=NULL, int count =-1);\r
#include "MessageBox.h"\r
#include "PullFetchDlg.h"\r
#include "ProgressDlg.h"\r
+#include "FileDiffDlg.h"\r
\r
bool PullCommand::Execute()\r
{\r
CString url;\r
url=dlg.m_RemoteURL;\r
CString cmd;\r
+ CString hashOld = g_Git.GetHash(L"HEAD");\r
cmd.Format(_T("git.exe pull \"%s\" %s"),url,dlg.m_RemoteBranchName);\r
CProgressDlg progress;\r
progress.m_GitCmd=cmd;\r
if(progress.DoModal()==IDOK)\r
+ {\r
+ CString hashNew = g_Git.GetHash(L"HEAD");\r
+ CFileDiffDlg dlg;\r
+ dlg.SetDiff(NULL,hashOld,hashNew);\r
+ dlg.DoModal();\r
+\r
return TRUE;\r
+ }\r
}\r
#if 0\r
CCloneDlg dlg;\r