mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 13:26:29 +02:00
Code

Merge branch 'dm/svn-remote' 

* dm/svn-remote:
  git-svn: Make branch use correct svn-remote
This commit is contained in:
Junio C Hamano 2008-12-03 22:44:26 -08:00
parent ad685681c2 a0fbc87cff
commit 123ed65908
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-svn.perl
View File

@ -558,7 +558,7 @@ sub cmd_branch {
my ($src, $rev, undef, $gs) = working_head_info($head);
my $remote = Git::SVN::read_all_remotes()->{svn};
my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
my $glob = $remote->{ $_tag ? 'tags' : 'branches' };
my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
my $dst = join '/', $remote->{url}, $lft, $branch_name, ($rgt || ());

19
t/t9128-git-svn-cmd-branch.sh
View File

@ -56,4 +56,23 @@ test_expect_success 'git svn branch tests' '
test_must_fail git svn tag tag1
'
test_expect_success 'branch uses correct svn-remote' '
(svn co "$svnrepo" svn &&
cd svn &&
mkdir mirror &&
svn add mirror &&
svn copy trunk mirror/ &&
svn copy tags mirror/ &&
svn copy branches mirror/ &&
svn ci -m "made mirror" ) &&
rm -rf svn &&
git svn init -s -R mirror --prefix=mirror/ "$svnrepo"/mirror &&
git svn fetch -R mirror &&
git checkout mirror/trunk &&
base=$(git rev-parse HEAD:) &&
git svn branch -m "branch in mirror" d &&
test $base = $(git rev-parse remotes/mirror/d:) &&
test_must_fail git rev-parse remotes/d
'
test_done