mirror of
https://github.com/git/git.git
synced 2024-10-31 14:27:54 +01:00
fe191fcaa5
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>
125 lines
5 KiB
Bash
Executable file
125 lines
5 KiB
Bash
Executable file
#!/bin/sh
|
|
# Copyright (c) 2006 Eric Wong
|
|
test_description='git svn metadata migrations from previous versions'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'setup old-looking metadata' '
|
|
cp "$GIT_DIR"/config "$GIT_DIR"/config-old-git-svn &&
|
|
mkdir import &&
|
|
(
|
|
cd import &&
|
|
for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
|
|
do
|
|
mkdir -p $i &&
|
|
echo hello >>$i/README ||
|
|
exit 1
|
|
done &&
|
|
svn_cmd import -m test . "$svnrepo"
|
|
) &&
|
|
git svn init "$svnrepo" &&
|
|
git svn fetch &&
|
|
rm -rf "$GIT_DIR"/svn &&
|
|
git update-ref refs/heads/git-svn-HEAD refs/${remotes_git_svn} &&
|
|
git update-ref refs/heads/svn-HEAD refs/${remotes_git_svn} &&
|
|
git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
|
|
'
|
|
|
|
head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
|
|
test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
|
|
|
|
svnrepo_escaped=`echo $svnrepo | sed 's/ /%20/'`
|
|
|
|
test_expect_success 'initialize old-style (v0) git svn layout' '
|
|
mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
|
|
echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
|
|
echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
|
|
git svn migrate &&
|
|
! test -d "$GIT_DIR"/git-svn &&
|
|
git rev-parse --verify refs/${remotes_git_svn}^0 &&
|
|
git rev-parse --verify refs/remotes/svn^0 &&
|
|
test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
|
|
test `git config --get svn-remote.svn.fetch` = \
|
|
":refs/${remotes_git_svn}"
|
|
'
|
|
|
|
test_expect_success 'initialize a multi-repository repo' '
|
|
git svn init "$svnrepo" -T trunk -t tags -b branches &&
|
|
git config --get-all svn-remote.svn.fetch > fetch.out &&
|
|
grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
|
|
test -n "`git config --get svn-remote.svn.branches \
|
|
"^branches/\*:refs/remotes/origin/\*$"`" &&
|
|
test -n "`git config --get svn-remote.svn.tags \
|
|
"^tags/\*:refs/remotes/origin/tags/\*$"`" &&
|
|
git config --unset svn-remote.svn.branches \
|
|
"^branches/\*:refs/remotes/origin/\*$" &&
|
|
git config --unset svn-remote.svn.tags \
|
|
"^tags/\*:refs/remotes/origin/tags/\*$" &&
|
|
git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" &&
|
|
git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" &&
|
|
for i in tags/0.1 tags/0.2 tags/0.3; do
|
|
git config --add svn-remote.svn.fetch \
|
|
$i:refs/remotes/origin/$i || exit 1; done &&
|
|
git config --get-all svn-remote.svn.fetch > fetch.out &&
|
|
grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
|
|
grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
|
|
grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
|
|
grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
|
|
grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
|
|
grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
|
|
grep "^:refs/${remotes_git_svn}" fetch.out
|
|
'
|
|
|
|
# refs should all be different, but the trees should all be the same:
|
|
test_expect_success 'multi-fetch works on partial urls + paths' "
|
|
git svn multi-fetch &&
|
|
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
|
|
git rev-parse --verify refs/remotes/origin/\$i^0 >> refs.out || exit 1;
|
|
done &&
|
|
test -z \"\`sort < refs.out | uniq -d\`\" &&
|
|
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
|
|
for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do
|
|
if test \$j != \$i; then continue; fi
|
|
test -z \"\`git diff refs/remotes/origin/\$i \
|
|
refs/remotes/origin/\$j\`\" ||exit 1; done; done
|
|
"
|
|
|
|
test_expect_success 'migrate --minimize on old inited layout' '
|
|
git config --unset-all svn-remote.svn.fetch &&
|
|
git config --unset-all svn-remote.svn.url &&
|
|
rm -rf "$GIT_DIR"/svn &&
|
|
for i in `cat fetch.out`; do
|
|
path=`expr $i : "\([^:]*\):.*$"`
|
|
ref=`expr $i : "[^:]*:\(refs/remotes/.*\)$"`
|
|
if test -z "$ref"; then continue; fi
|
|
if test -n "$path"; then path="/$path"; fi
|
|
( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
|
|
echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
|
|
done &&
|
|
git svn migrate --minimize &&
|
|
test -z "`git config -l | grep "^svn-remote\.git-svn\."`" &&
|
|
git config --get-all svn-remote.svn.fetch > fetch.out &&
|
|
grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
|
|
grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
|
|
grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
|
|
grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
|
|
grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
|
|
grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
|
|
grep "^:refs/${remotes_git_svn}" fetch.out
|
|
'
|
|
|
|
test_expect_success ".rev_db auto-converted to .rev_map.UUID" '
|
|
git svn fetch -i trunk &&
|
|
test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
|
|
expect="$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_map.*)" &&
|
|
test -n "$expect" &&
|
|
rev_db="$(echo $expect | sed -e "s,_map,_db,")" &&
|
|
convert_to_rev_db "$expect" "$rev_db" &&
|
|
rm -f "$expect" &&
|
|
test -f "$rev_db" &&
|
|
git svn fetch -i trunk &&
|
|
test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
|
|
test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
|
|
test -f "$expect"
|
|
'
|
|
|
|
test_done
|