From: Frank Li Date: Mon, 30 Nov 2009 14:32:40 +0000 (+0800) Subject: Fixed issue #234: First log(first commit in history) was missing... X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=f532c0a563d3860ffa38a91ed224add0e5a8bc90 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 --- diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 986c780..04ebca9 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 84e89ca..35057e4 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 031c51c..1b0e56c 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);