X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FGit%2FGitFolderStatus.cpp;h=b9a4342d9d3517c5ed996e0c59b0e2e41cbf9adc;hp=16bde65699dad3ee3b206d2c591fbe2bddca9bc1;hb=cbc6d08b200953d37cef56f9cfa17cee3bdc360e;hpb=1346fca1939cfc57164855afaafb7a9d538eab3b diff --git a/src/Git/GitFolderStatus.cpp b/src/Git/GitFolderStatus.cpp index 16bde65..b9a4342 100644 --- a/src/Git/GitFolderStatus.cpp +++ b/src/Git/GitFolderStatus.cpp @@ -251,18 +251,18 @@ const FileStatusCacheEntry * GitFolderStatus::BuildCache(const CTGitPath& filepa { // extract the sub-path (relative to project root) //MessageBox(NULL, filepath.GetDirectory().GetWinPathString(), sProjectRoot, MB_OK); - LPCSTR lpszSubPath = NULL; - CStringA sSubPath; + LPCTSTR lpszSubPath = NULL; + CString sSubPath; CString s = filepath.GetDirectory().GetWinPathString(); if (s.GetLength() > sProjectRoot.GetLength()) { - sSubPath = CStringA(s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/)); + sSubPath = s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/); lpszSubPath = sSubPath; } //if (lpszSubPath) MessageBoxA(NULL, lpszSubPath, "BuildCache", MB_OK); //MessageBoxA(NULL, CStringA(sProjectRoot), sSubPath, MB_OK); - err = !wgEnumFiles(CStringA(sProjectRoot), lpszSubPath, WGEFF_NoRecurse|WGEFF_FullPath|WGEFF_DirStatusAll, &fillstatusmap, this); + err = !wgEnumFiles(sProjectRoot, lpszSubPath, WGEFF_NoRecurse|WGEFF_FullPath|WGEFF_DirStatusAll, &fillstatusmap, this); /*err = svn_client_status4 (&youngest, filepath.GetDirectory().GetSVNApiPath(pool),