From f97b3b2d75946bf47204619b9e4d598ef53da38e Mon Sep 17 00:00:00 2001 From: Frank Li Date: Tue, 20 Jan 2009 16:11:45 +0800 Subject: [PATCH] Handle rename in path {} --- src/Git/TGitPath.cpp | 11 ++++++----- src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp index 418f236..0d83418 100644 --- a/src/Git/TGitPath.cpp +++ b/src/Git/TGitPath.cpp @@ -947,12 +947,13 @@ int CTGitPathList::ParserFromLog(CString &log) if(rename>0) { CString basepath; - int include_left=one.Find(_T("/{")); - if(include_left>0) + int include_left=one.Find(_T("{")); + int include_right=one.Find(_T("}"),rename); + if(include_left>0 && include_right>0 ) { - basepath=one.Left(include_left+1); - CString newname=basepath+one.Mid(rename+4,one.GetLength()-rename-5); - CString oldname=basepath+one.Mid(include_left+2,rename-include_left-2); + basepath=one.Left(include_left); + CString newname=basepath+one.Mid(rename+4,include_right-rename-4)+one.Right(one.GetLength()-include_right-1); + CString oldname=basepath+one.Mid(include_left+2,rename-include_left-2)+one.Right(one.GetLength()-include_right-1); path.SetFromGit(newname,&oldname ); }else path.SetFromGit(one.Right(one.GetLength()-rename-4),&one.Left(rename)); diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user index 5e21fdd..db909ba 100644 --- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user +++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user @@ -11,7 +11,7 @@