mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
a0fbc87cff
The 'branch' subcommand incorrectly had the svn-remote to use hardcoded as 'svn', the default remote name. This meant that branches derived from other svn-remotes would try to use the branch and tag configuration for the 'svn' remote, potentially copying would-be branches to the wrong place in SVN, into the branch namespace for another project. Fix this by using the remote name extracted from the svn info for the specified git ref. Add a testcase for this behaviour. [jc: squashed in a fix to test from Michael J Gruber for older svn (1.4)] Signed-off-by: Deskin Miller <deskinm@umich.edu> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
78 lines
2 KiB
Bash
Executable file
78 lines
2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 Deskin Miller
|
|
#
|
|
|
|
test_description='git svn partial-rebuild tests'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'initialize svnrepo' '
|
|
mkdir import &&
|
|
(
|
|
cd import &&
|
|
mkdir trunk branches tags &&
|
|
cd trunk &&
|
|
echo foo > foo &&
|
|
cd .. &&
|
|
svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
|
|
cd .. &&
|
|
rm -rf import &&
|
|
svn co "$svnrepo"/trunk trunk &&
|
|
cd trunk &&
|
|
echo bar >> foo &&
|
|
svn ci -m "updated trunk" &&
|
|
cd .. &&
|
|
rm -rf trunk
|
|
)
|
|
'
|
|
|
|
test_expect_success 'import into git' '
|
|
git svn init --stdlayout "$svnrepo" &&
|
|
git svn fetch &&
|
|
git checkout remotes/trunk
|
|
'
|
|
|
|
test_expect_success 'git svn branch tests' '
|
|
git svn branch a &&
|
|
base=$(git rev-parse HEAD:) &&
|
|
test $base = $(git rev-parse remotes/a:) &&
|
|
git svn branch -m "created branch b blah" b &&
|
|
test $base = $(git rev-parse remotes/b:) &&
|
|
test_must_fail git branch -m "no branchname" &&
|
|
git svn branch -n c &&
|
|
test_must_fail git rev-parse remotes/c &&
|
|
test_must_fail git svn branch a &&
|
|
git svn branch -t tag1 &&
|
|
test $base = $(git rev-parse remotes/tags/tag1:) &&
|
|
git svn branch --tag tag2 &&
|
|
test $base = $(git rev-parse remotes/tags/tag2:) &&
|
|
git svn tag tag3 &&
|
|
test $base = $(git rev-parse remotes/tags/tag3:) &&
|
|
git svn tag -m "created tag4 foo" tag4 &&
|
|
test $base = $(git rev-parse remotes/tags/tag4:) &&
|
|
test_must_fail git svn tag -m "no tagname" &&
|
|
git svn tag -n tag5 &&
|
|
test_must_fail git rev-parse remotes/tags/tag5 &&
|
|
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
|