OSDN Git Service

Show changed files after pull.
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / PullCommand.cpp
index 52b6996..6ef53f8 100644 (file)
@@ -25,6 +25,7 @@
 #include "MessageBox.h"\r
 #include "PullFetchDlg.h"\r
 #include "ProgressDlg.h"\r
+#include "FileDiffDlg.h"\r
 \r
 bool PullCommand::Execute()\r
 {\r
@@ -35,11 +36,19 @@ bool PullCommand::Execute()
                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