2007-11-17 20:47:16 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Eric Wong
|
|
|
|
#
|
|
|
|
|
2008-09-08 10:02:08 +00:00
|
|
|
test_description='git svn init/clone tests'
|
2007-11-17 20:47:16 +00:00
|
|
|
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
# setup, run inside tmp so we don't have any conflicts with $svnrepo
|
|
|
|
set -e
|
|
|
|
rm -r .git
|
|
|
|
mkdir tmp
|
|
|
|
cd tmp
|
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'setup svnrepo' '
|
2007-11-17 20:47:16 +00:00
|
|
|
mkdir project project/trunk project/branches project/tags &&
|
|
|
|
echo foo > project/trunk/foo &&
|
2009-05-08 08:06:16 +00:00
|
|
|
svn_cmd import -m "$test_description" project "$svnrepo"/project &&
|
2007-11-17 20:47:16 +00:00
|
|
|
rm -rf project
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-11-17 20:47:16 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'basic clone' '
|
2007-11-17 20:47:16 +00:00
|
|
|
test ! -d trunk &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git svn clone "$svnrepo"/project/trunk &&
|
2007-11-17 20:47:16 +00:00
|
|
|
test -d trunk/.git/svn &&
|
|
|
|
test -e trunk/foo &&
|
|
|
|
rm -rf trunk
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-11-17 20:47:16 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'clone to target directory' '
|
2007-11-17 20:47:16 +00:00
|
|
|
test ! -d target &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git svn clone "$svnrepo"/project/trunk target &&
|
2007-11-17 20:47:16 +00:00
|
|
|
test -d target/.git/svn &&
|
|
|
|
test -e target/foo &&
|
|
|
|
rm -rf target
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-11-17 20:47:16 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'clone with --stdlayout' '
|
2007-11-17 20:47:16 +00:00
|
|
|
test ! -d project &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git svn clone -s "$svnrepo"/project &&
|
2007-11-17 20:47:16 +00:00
|
|
|
test -d project/.git/svn &&
|
|
|
|
test -e project/foo &&
|
|
|
|
rm -rf project
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-11-17 20:47:16 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'clone to target directory with --stdlayout' '
|
2007-11-17 20:47:16 +00:00
|
|
|
test ! -d target &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git svn clone -s "$svnrepo"/project target &&
|
2007-11-17 20:47:16 +00:00
|
|
|
test -d target/.git/svn &&
|
|
|
|
test -e target/foo &&
|
|
|
|
rm -rf target
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-11-17 20:47:16 +00:00
|
|
|
|
2013-10-11 12:57:06 +00:00
|
|
|
test_expect_success 'init without -s/-T/-b/-t does not warn' '
|
|
|
|
test ! -d trunk &&
|
|
|
|
git svn init "$svnrepo"/project/trunk trunk 2>warning &&
|
|
|
|
test_must_fail grep -q prefix warning &&
|
|
|
|
rm -rf trunk &&
|
|
|
|
rm -f warning
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone without -s/-T/-b/-t does not warn' '
|
|
|
|
test ! -d trunk &&
|
|
|
|
git svn clone "$svnrepo"/project/trunk 2>warning &&
|
|
|
|
test_must_fail grep -q prefix warning &&
|
|
|
|
rm -rf trunk &&
|
|
|
|
rm -f warning
|
|
|
|
'
|
|
|
|
|
|
|
|
test_svn_configured_prefix () {
|
|
|
|
prefix=$1 &&
|
|
|
|
cat >expect <<EOF &&
|
|
|
|
project/trunk:refs/remotes/${prefix}trunk
|
|
|
|
project/branches/*:refs/remotes/${prefix}*
|
|
|
|
project/tags/*:refs/remotes/${prefix}tags/*
|
|
|
|
EOF
|
|
|
|
test ! -f actual &&
|
|
|
|
git --git-dir=project/.git config svn-remote.svn.fetch >>actual &&
|
|
|
|
git --git-dir=project/.git config svn-remote.svn.branches >>actual &&
|
|
|
|
git --git-dir=project/.git config svn-remote.svn.tags >>actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
rm -f expect actual
|
|
|
|
}
|
|
|
|
|
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking branches.
Furthermore, combining git-svn with regular git remotes run the risk of
clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
The existing workaround for this is to supply the --prefix=quux/ to
git svn init/clone, so that git-svn's tracking branches end up in
refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
users to specify --prefix to work around a design flaw in git-svn is
suboptimal, and not a long term solution to the problem. Instead,
git-svn should default to use a non-empty prefix that saves
unsuspecting users from the inconveniences described above.
This patch will only affect newly created git-svn setups, as the
--prefix option only applies to git svn init (and git svn clone).
Existing git-svn setups will continue with their existing (lack of)
prefix. Also, if anyone somehow prefers git-svn's old layout, they
can recreate that by explicitly passing an empty prefix (--prefix "")
on the git svn init/clone command line.
The patch changes the default value for --prefix from "" to "origin/",
updates the git-svn manual page, and fixes the fallout in the git-svn
testcases.
(Note that this patch might be easier to review using the --word-diff
and --word-diff-regex=. diff options.)
[ew: squashed description of <= 1.9 behavior into manpage]
Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:07 +00:00
|
|
|
test_expect_success 'init with -s/-T/-b/-t assumes --prefix=origin/' '
|
2013-10-11 12:57:06 +00:00
|
|
|
test ! -d project &&
|
|
|
|
git svn init -s "$svnrepo"/project project 2>warning &&
|
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking branches.
Furthermore, combining git-svn with regular git remotes run the risk of
clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
The existing workaround for this is to supply the --prefix=quux/ to
git svn init/clone, so that git-svn's tracking branches end up in
refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
users to specify --prefix to work around a design flaw in git-svn is
suboptimal, and not a long term solution to the problem. Instead,
git-svn should default to use a non-empty prefix that saves
unsuspecting users from the inconveniences described above.
This patch will only affect newly created git-svn setups, as the
--prefix option only applies to git svn init (and git svn clone).
Existing git-svn setups will continue with their existing (lack of)
prefix. Also, if anyone somehow prefers git-svn's old layout, they
can recreate that by explicitly passing an empty prefix (--prefix "")
on the git svn init/clone command line.
The patch changes the default value for --prefix from "" to "origin/",
updates the git-svn manual page, and fixes the fallout in the git-svn
testcases.
(Note that this patch might be easier to review using the --word-diff
and --word-diff-regex=. diff options.)
[ew: squashed description of <= 1.9 behavior into manpage]
Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:07 +00:00
|
|
|
test_must_fail grep -q prefix warning &&
|
|
|
|
test_svn_configured_prefix "origin/" &&
|
2013-10-11 12:57:06 +00:00
|
|
|
rm -rf project &&
|
|
|
|
rm -f warning
|
|
|
|
'
|
|
|
|
|
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking branches.
Furthermore, combining git-svn with regular git remotes run the risk of
clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
The existing workaround for this is to supply the --prefix=quux/ to
git svn init/clone, so that git-svn's tracking branches end up in
refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
users to specify --prefix to work around a design flaw in git-svn is
suboptimal, and not a long term solution to the problem. Instead,
git-svn should default to use a non-empty prefix that saves
unsuspecting users from the inconveniences described above.
This patch will only affect newly created git-svn setups, as the
--prefix option only applies to git svn init (and git svn clone).
Existing git-svn setups will continue with their existing (lack of)
prefix. Also, if anyone somehow prefers git-svn's old layout, they
can recreate that by explicitly passing an empty prefix (--prefix "")
on the git svn init/clone command line.
The patch changes the default value for --prefix from "" to "origin/",
updates the git-svn manual page, and fixes the fallout in the git-svn
testcases.
(Note that this patch might be easier to review using the --word-diff
and --word-diff-regex=. diff options.)
[ew: squashed description of <= 1.9 behavior into manpage]
Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:07 +00:00
|
|
|
test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' '
|
2013-10-11 12:57:06 +00:00
|
|
|
test ! -d project &&
|
|
|
|
git svn clone -s "$svnrepo"/project 2>warning &&
|
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking branches.
Furthermore, combining git-svn with regular git remotes run the risk of
clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
The existing workaround for this is to supply the --prefix=quux/ to
git svn init/clone, so that git-svn's tracking branches end up in
refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
users to specify --prefix to work around a design flaw in git-svn is
suboptimal, and not a long term solution to the problem. Instead,
git-svn should default to use a non-empty prefix that saves
unsuspecting users from the inconveniences described above.
This patch will only affect newly created git-svn setups, as the
--prefix option only applies to git svn init (and git svn clone).
Existing git-svn setups will continue with their existing (lack of)
prefix. Also, if anyone somehow prefers git-svn's old layout, they
can recreate that by explicitly passing an empty prefix (--prefix "")
on the git svn init/clone command line.
The patch changes the default value for --prefix from "" to "origin/",
updates the git-svn manual page, and fixes the fallout in the git-svn
testcases.
(Note that this patch might be easier to review using the --word-diff
and --word-diff-regex=. diff options.)
[ew: squashed description of <= 1.9 behavior into manpage]
Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:07 +00:00
|
|
|
test_must_fail grep -q prefix warning &&
|
|
|
|
test_svn_configured_prefix "origin/" &&
|
2013-10-11 12:57:06 +00:00
|
|
|
rm -rf project &&
|
|
|
|
rm -f warning
|
|
|
|
'
|
|
|
|
|
2014-04-22 11:16:22 +00:00
|
|
|
test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' '
|
2013-10-11 12:57:06 +00:00
|
|
|
test ! -d project &&
|
2014-04-22 11:16:22 +00:00
|
|
|
git svn init -s "$svnrepo"/project project --prefix "" 2>warning &&
|
2013-10-11 12:57:06 +00:00
|
|
|
test_must_fail grep -q prefix warning &&
|
|
|
|
test_svn_configured_prefix "" &&
|
|
|
|
rm -rf project &&
|
|
|
|
rm -f warning
|
|
|
|
'
|
|
|
|
|
2014-04-22 11:16:22 +00:00
|
|
|
test_expect_success 'clone with -s/-T/-b/-t and --prefix "" still works' '
|
2013-10-11 12:57:06 +00:00
|
|
|
test ! -d project &&
|
2014-04-22 11:16:22 +00:00
|
|
|
git svn clone -s "$svnrepo"/project --prefix "" 2>warning &&
|
2013-10-11 12:57:06 +00:00
|
|
|
test_must_fail grep -q prefix warning &&
|
|
|
|
test_svn_configured_prefix "" &&
|
|
|
|
rm -rf project &&
|
|
|
|
rm -f warning
|
|
|
|
'
|
|
|
|
|
2007-11-17 20:47:16 +00:00
|
|
|
test_done
|