if( m_RebaseStage == REBASE_DONE)\r
{\r
OnOK();\r
+ return;\r
}\r
\r
if( this->m_IsFastForward )\r
{\r
+ CString cmd,out;\r
+ CString oldbranch = g_Git.GetCurrentBranch();\r
+ if( oldbranch != m_BranchCtrl.GetString() )\r
+ {\r
+ cmd.Format(_T("git.exe checkout %s"),m_BranchCtrl.GetString());\r
+ AddLogString(cmd);\r
+ if( g_Git.Run(cmd,&out,CP_ACP) )\r
+ {\r
+ this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);\r
+ AddLogString(out);\r
+ return;\r
+ }\r
+ }\r
+ AddLogString(out);\r
+ out.Empty();\r
m_OrigBranchHash = g_Git.GetHash(m_BranchCtrl.GetString());\r
m_OrigUpstreamHash = g_Git.GetHash(this->m_UpstreamCtrl.GetString());\r
\r
AddLogString(_T("No fast forward\r\nMaybe repository changed"));\r
return;\r
}\r
- CString cmd,out;\r
+ \r
cmd.Format(_T("git.exe reset --hard %s"),this->m_UpstreamCtrl.GetString());\r
this->AddLogString(CString(_T("Fast forward to "))+m_UpstreamCtrl.GetString());\r
\r