Fix format string %s , commit_hash problem.

It should use commithash.ToString()

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
index 4d36c8c..8ba2b5e 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
+++ b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
@@ -2624,7 +2624,7 @@ void CTortoiseGitBlameView::OnMouseHover(UINT nFlags, CPoint point)
                        this->ClientToScreen(&point);\r
 \r
                        CString str;\r
-                       str.Format(_T("%s\n<b>%s</b>\n%s %s\n%s"),pRev->m_CommitHash,\r
+                       str.Format(_T("%s\n<b>%s</b>\n%s %s\n%s"),pRev->m_CommitHash.ToString(),\r
                                                                                                           pRev->m_Subject,\r
                                                                                                           pRev->m_AuthorName,\r
                                                                                                           CAppUtils::FormatDateAndTime( pRev->m_AuthorDate, m_DateFormat ), \r

diff --git a/src/TortoiseProc/GitLogListAction.cpp b/src/TortoiseProc/GitLogListAction.cpp
index 21558cc..52aa34b 100644 (file)
--- a/src/TortoiseProc/GitLogListAction.cpp
+++ b/src/TortoiseProc/GitLogListAction.cpp
@@ -73,7 +73,7 @@ int CGitLogList::CherryPickFrom(CString from, CString to)
        {\r
                if (progress.IsValid())\r
                {\r
-                       progress.FormatPathLine(1, _T("Pick up %s"), logs.GetGitRevAt(i).m_CommitHash);\r
+                       progress.FormatPathLine(1, _T("Pick up %s"), logs.GetGitRevAt(i).m_CommitHash.ToString());\r
                        progress.FormatPathLine(2, _T("%s"), logs.GetGitRevAt(i).m_Subject);\r
                        progress.SetProgress(logs.size()-i, logs.size());\r
                }\r
@@ -84,7 +84,7 @@ int CGitLogList::CherryPickFrom(CString from, CString to)
                        return -1;\r
                }\r
                CString cmd,out;\r
-               cmd.Format(_T("git.exe cherry-pick %s"),logs.GetGitRevAt(i).m_CommitHash);\r
+               cmd.Format(_T("git.exe cherry-pick %s"),logs.GetGitRevAt(i).m_CommitHash.ToString());\r
                out.Empty();\r
                if(g_Git.Run(cmd,&out,CP_UTF8))\r
                {\r
@@ -126,7 +126,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                                GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));\r
                                if(!r1->m_CommitHash.IsEmpty())\r
                                {\r
-                                       cmd.Format(_T("git.exe diff-tree -r -p --stat %s"),r1->m_CommitHash);\r
+                                       cmd.Format(_T("git.exe diff-tree -r -p --stat %s"),r1->m_CommitHash.ToString());\r
                                }else\r
                                        cmd.Format(_T("git.exe diff -r -p --stat"));\r
 \r
@@ -144,12 +144,12 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                                \r
                                if( r1->m_CommitHash.IsEmpty())\r
                                {\r
-                                       cmd.Format(_T("git.exe diff -r -p --stat %s"),r2->m_CommitHash);\r
+                                       cmd.Format(_T("git.exe diff -r -p --stat %s"),r2->m_CommitHash.ToString());\r
                                }else if( r2->m_CommitHash.IsEmpty())\r
                                {\r
-                                       cmd.Format(_T("git.exe diff -r -p --stat %s"),r1->m_CommitHash);\r
+                                       cmd.Format(_T("git.exe diff -r -p --stat %s"),r1->m_CommitHash.ToString());\r
                                }else\r
-                                       cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),r1->m_CommitHash,r2->m_CommitHash);\r
+                                       cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),r1->m_CommitHash.ToString(),r2->m_CommitHash.ToString());\r
 \r
                                g_Git.RunLogFile(cmd,tempfile);\r
                                CAppUtils::StartUnifiedDiffViewer(tempfile,r1->m_CommitHash.ToString().Left(6)+_T(":")+r2->m_CommitHash.ToString().Left(6));\r
@@ -299,7 +299,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                        //Use throw to abort this process (reset back to original HEAD)\r
                        try\r
                        {\r
-                               cmd.Format(_T("git.exe reset --hard  %s"),pFirstEntry->m_CommitHash);\r
+                               cmd.Format(_T("git.exe reset --hard  %s"),pFirstEntry->m_CommitHash.ToString());\r
                                if(g_Git.Run(cmd,&out,CP_UTF8))\r
                                {\r
                                        CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
@@ -340,7 +340,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                                                //\r
                                                //Later the progress dialog could be used to execute these steps.\r
 \r
-                                               if(CherryPickFrom(pFirstEntry->m_CommitHash,headhash))\r
+                                               if(CherryPickFrom(pFirstEntry->m_CommitHash.ToString(),headhash))\r
                                                {\r
                                                        CString msg;\r
                                                        msg.Format(_T("Error while cherry pick commits on top of combined commits. Aborting.\r\n\r\n"));\r

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 8c4a4a2..59c6386 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -2493,7 +2493,7 @@ void CGitLogListBase::RecalculateShownList(CPtrArray * pShownlist)
                        }\r
                        if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))\r
                        {\r
-                               sRev.Format(_T("%s"), m_logEntries.GetGitRevAt(i).m_CommitHash);\r
+                               sRev.Format(_T("%s"), m_logEntries.GetGitRevAt(i).m_CommitHash.ToString());\r
                                if ((sRev.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
                                {\r
                                        pShownlist->Add(&m_logEntries.GetGitRevAt(i));\r

diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index fe576a4..5ba466b 100644 (file)
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -1387,9 +1387,9 @@ void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool b
 \r
        CString cmd;\r
 \r
-       cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
+       cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash.ToString(),(*m_currentChangedArray)[selIndex].GetGitPathString());\r
        g_Git.RunLogFile(cmd,file1);\r
-       cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
+       cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash.ToString(),(*m_currentChangedArray)[selIndex].GetGitPathString());\r
        g_Git.RunLogFile(cmd,file2);\r
 \r
        CAppUtils::DiffFlags flags;\r

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index d3551b0..d26fe2f 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -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