merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / RebaseDlg.cpp

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index ac4b1ac..d26fe2f 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -274,7 +274,7 @@ void CRebaseDlg::SetAllRebaseAction(int action)
 {\r
        for(int i=0;i<this->m_CommitList.m_logEntries.size();i++)\r
        {\r
-               m_CommitList.m_logEntries[i].m_Action=action;\r
+               m_CommitList.m_logEntries.GetGitRevAt(i).m_Action=action;\r
        }\r
        m_CommitList.Invalidate();\r
 }\r
@@ -517,7 +517,7 @@ void CRebaseDlg::FetchLogList()
        \r
        for(int i=0;i<m_CommitList.m_logEntries.size();i++)\r
        {\r
-               m_CommitList.m_logEntries[i].m_Action = CTGitPath::LOGACTIONS_REBASE_PICK;\r
+               m_CommitList.m_logEntries.GetGitRevAt(i).m_Action = CTGitPath::LOGACTIONS_REBASE_PICK;\r
        }\r
 \r
        m_CommitList.Invalidate();\r
@@ -542,7 +542,7 @@ void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)
                GitRev rev;\r
                rev.ParserFromLog(data);\r
                tooltip.Format(_T("CommitHash:%s\nCommit by: %s  %s\n <b>%s</b> \n %s"),\r
-                       rev.m_CommitHash,\r
+                       rev.m_CommitHash.ToString(),\r
                        rev.m_AuthorName,\r
                        CAppUtils::FormatDateAndTime(rev.m_AuthorDate,DATE_LONGDATE),\r
                        rev.m_Subject,\r
@@ -787,7 +787,7 @@ void CRebaseDlg::OnBnClickedContinue()
                \r
                CString out =_T("");\r
                CString cmd;\r
-               cmd.Format(_T("git.exe commit -C %s"), curRev->m_CommitHash);\r
+               cmd.Format(_T("git.exe commit -C %s"), curRev->m_CommitHash.ToString());\r
 \r
                if(g_Git.Run(cmd,&out,CP_UTF8))\r
                {\r
@@ -1161,10 +1161,10 @@ int CRebaseDlg::DoRebase()
                nocommit=_T(" --no-commit ");\r
 \r
        CString log;\r
-       log.Format(_T("%s %d:%s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash);\r
+       log.Format(_T("%s %d:%s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash.ToString());\r
        AddLogString(log);\r
        AddLogString(pRev->m_Subject);\r
-       cmd.Format(_T("git.exe cherry-pick %s %s"),nocommit,pRev->m_CommitHash);\r
+       cmd.Format(_T("git.exe cherry-pick %s %s"),nocommit,pRev->m_CommitHash.ToString());\r
 \r
        if(g_Git.Run(cmd,&out,CP_UTF8))\r
        {\r