OSDN Git Service

Add launch rebase option at fetch dialog.
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / FetchCommand.cpp
index 3d0f260..86f168c 100644 (file)
@@ -26,6 +26,7 @@
 #include "PullFetchDlg.h"\r
 #include "ProgressDlg.h"\r
 #include "AppUtils.h"\r
+#include "RebaseDlg.h"\r
 \r
 bool FetchCommand::Execute()\r
 {\r
@@ -46,7 +47,18 @@ bool FetchCommand::Execute()
                CProgressDlg progress;\r
                progress.m_GitCmd=cmd;\r
                if(progress.DoModal()==IDOK)\r
+               {\r
+                       if( progress.m_GitStatus ==0 && dlg.m_bRebase)\r
+                       {\r
+                                       CRebaseDlg dlg;\r
+                                       if(dlg.DoModal() == IDOK)\r
+                                       {\r
+                                               return TRUE;\r
+                                       }\r
+\r
+                       }\r
                        return TRUE;\r
+               }\r
        }\r
 #if 0\r
        CCloneDlg dlg;\r