Signed-off-by: Frank Li <lznuaa@gmail.com>
\r
hash=g_Git.GetHash(m_BranchCtrl.GetString());\r
\r
+ if(hash == g_Git.GetHash(this->m_UpstreamCtrl.GetString()))\r
+ {\r
+ m_CommitList.Clear();\r
+ CString text,fmt;\r
+ fmt.LoadString(IDS_REBASE_EQUAL_FMT);\r
+ text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());\r
+\r
+ m_CommitList.ShowText(text);\r
+ this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(false);\r
+ return;\r
+ }\r
+\r
hash=hash.Left(40);\r
\r
if(hash == base )\r