OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4c12d6
)
Fixed issue #155: SVN Rebase sets upstream as remotes/trunk
author
Frank Li
<lznuaa@gmail.com>
Wed, 2 Sep 2009 15:01:13 +0000
(23:01 +0800)
committer
Frank Li
<lznuaa@gmail.com>
Wed, 2 Sep 2009 15:01:13 +0000
(23:01 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/Commands/SVNRebaseCommand.cpp
patch
|
blob
|
history
diff --git
a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
index
09ee763
..
3f86c42
100644
(file)
--- a/
src/TortoiseProc/Commands/SVNRebaseCommand.cpp
+++ b/
src/TortoiseProc/Commands/SVNRebaseCommand.cpp
@@
-52,7
+52,17
@@
bool SVNRebaseCommand::Execute()
CRebaseDlg dlg;
\r
\r
dlg.m_PreCmd=_T("git.exe svn fetch");
\r
- dlg.m_Upstream=_T("remotes/trunk");
\r
+
\r
+ CString cmd,out;
\r
+ cmd = _T("git.exe config svn-remote.svn.fetch");
\r
+
\r
+ if(!g_Git.Run(cmd,&out,CP_ACP))
\r
+ {
\r
+ if(out.Left(5) == _T(":refs"))
\r
+ out=out.Mid(6);
\r
+ int start = 0;
\r
+ out=out.Tokenize(_T("\n"),start);
\r
+ }
\r
\r
if(dlg.DoModal() == IDOK)
\r
{
\r