Fixed issue #173: SVN Rebase does not work

The correct handle below case
git config svn-remote.svn.fetch
myproject/trunk:refs/remotes/trunk

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

diff --git a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
index 19cd322..2ddcd5a 100644 (file)
--- a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
+++ b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
@@ -58,9 +58,14 @@ bool SVNRebaseCommand::Execute()
 \r
        if(!g_Git.Run(cmd,&out,CP_ACP))\r
        {\r
+               int start = out.Find(_T(':'));\r
+               if( start >=0 )\r
+                       out=out.Mid(start);\r
+\r
                if(out.Left(5) == _T(":refs"))\r
                        out=out.Mid(6);\r
-               int start = 0;\r
+               \r
+               start = 0;\r
                out=out.Tokenize(_T("\n"),start);\r
        }else\r
        {\r