From 02b4972b0212d4374a62ed129185269da504c78a Mon Sep 17 00:00:00 2001 From: Frank Li Date: Mon, 30 Nov 2009 22:32:40 +0800 Subject: [PATCH] Fixed issue #234: First log(first commit in history) was missing... FetchShortLog set vector size as commits number. Miss work copy item Signed-off-by: Frank Li --- src/TortoiseProc/GitLogListBase.cpp | 2 +- src/TortoiseProc/LogDataVector.cpp | 4 ++-- src/TortoiseProc/LogDlgHelper.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 986c78004..04ebca90e 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -1765,7 +1765,7 @@ int CGitLogListBase::FillGitShortLog() if(m_bShowWC) this->m_logEntries.insert(m_logEntries.begin(),this->m_wcRev); - this->m_logEntries.FetchShortLog(path,m_StartRef,-1,mask); + this->m_logEntries.FetchShortLog(path,m_StartRef,-1,mask,m_bShowWC?1:0); //this->m_logEntries.ParserFromLog(); if(IsInWorkingThread()) diff --git a/src/TortoiseProc/LogDataVector.cpp b/src/TortoiseProc/LogDataVector.cpp index 84e89ca42..35057e4c3 100644 --- a/src/TortoiseProc/LogDataVector.cpp +++ b/src/TortoiseProc/LogDataVector.cpp @@ -112,7 +112,7 @@ int CLogDataVector::ParserShortLog(CTGitPath *path ,CString &hash,int count ,int return 0; } -int CLogDataVector::FetchShortLog(CTGitPath *path ,CString &hash,int count ,int mask ) +int CLogDataVector::FetchShortLog(CTGitPath *path ,CString &hash,int count ,int mask, int ShowWC ) { //BYTE_VECTOR log; m_RawlogData.clear(); @@ -152,7 +152,7 @@ int CLogDataVector::FetchShortLog(CTGitPath *path ,CString &hash,int count ,int //next=log.find(0,next); } - resize(m_RawLogStart.size()); + resize(m_RawLogStart.size() + ShowWC); t2=GetTickCount(); diff --git a/src/TortoiseProc/LogDlgHelper.h b/src/TortoiseProc/LogDlgHelper.h index 031c51c4d..1b0e56ca4 100644 --- a/src/TortoiseProc/LogDlgHelper.h +++ b/src/TortoiseProc/LogDlgHelper.h @@ -61,7 +61,7 @@ public: int ParserFromLog(CTGitPath *path =NULL,int count = -1,int infomask=CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_SHOW_MERGEDFILE, CString *from=NULL,CString *to=NULL); - int FetchShortLog(CTGitPath *path , CString &hash,int count=-1 ,int mask=CGit::LOG_INFO_ONLY_HASH ); + int FetchShortLog(CTGitPath *path , CString &hash,int count=-1 ,int mask=CGit::LOG_INFO_ONLY_HASH, int showWC=0 ); int ParserShortLog(CTGitPath *path ,CString &hash,int count=-1 ,int mask=CGit::LOG_INFO_ONLY_HASH ); int ParserFromRefLog(CString ref); -- 2.11.4.GIT