From 1d115d0e6ca273c95e1fadb8a7bf28654e27bad6 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 2 Sep 2009 23:01:13 +0800 Subject: [PATCH] Fixed issue #155: SVN Rebase sets upstream as remotes/trunk Signed-off-by: Frank Li --- src/TortoiseProc/Commands/SVNRebaseCommand.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp index 09ee76390..3f86c4215 100644 --- a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp +++ b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp @@ -52,7 +52,17 @@ bool SVNRebaseCommand::Execute() CRebaseDlg dlg; dlg.m_PreCmd=_T("git.exe svn fetch"); - dlg.m_Upstream=_T("remotes/trunk"); + + CString cmd,out; + cmd = _T("git.exe config svn-remote.svn.fetch"); + + if(!g_Git.Run(cmd,&out,CP_ACP)) + { + if(out.Left(5) == _T(":refs")) + out=out.Mid(6); + int start = 0; + out=out.Tokenize(_T("\n"),start); + } if(dlg.DoModal() == IDOK) { -- 2.11.4.GIT