summaryrefslogtreecommitdiff
path: root/t/t9104-git-svn-follow-parent.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-29 05:34:23 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-02-23 08:57:10 (GMT)
commitce2a0f2f9d9fd8eee8eaa1f24a60bdafade80c24 (patch)
treeb4281f271a1e3afb9c813eb64f9b6a73f305db8e /t/t9104-git-svn-follow-parent.sh
parent2b27f6c8847ebee631e7ad17ac9986e461d7674b (diff)
downloadgit-ce2a0f2f9d9fd8eee8eaa1f24a60bdafade80c24.zip
git-ce2a0f2f9d9fd8eee8eaa1f24a60bdafade80c24.tar.gz
git-ce2a0f2f9d9fd8eee8eaa1f24a60bdafade80c24.tar.bz2
git-svn: stop using path names as refnames with --follow-parent
Using path names as refnames breaks horribly if a user is tracking one large, toplevel directory, and a lower-level directory is followed from another project is a parent of another ref, as it will cause refnames such as: 'refs/remotes/trunk/path/to/stuff', which will conflict with a refname of 'refs/remotes/trunk'. Now we just append @$revno to the end of it the current refname. And if we have followed back to a grandparent, then we'll strip any existing '@$parent_revno' strings before appending our own '@$revno' string to it. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9104-git-svn-follow-parent.sh')
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 6d243f8..0f4e736 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -30,10 +30,12 @@ test_expect_success 'initialize repo' "
test_expect_success 'init and fetch --follow-parent a moved directory' "
git-svn init -i thunk $svnrepo/thunk &&
git-svn fetch --follow-parent -i thunk &&
- test \"\`git-rev-parse --verify refs/remotes/trunk\`\" \
+ test \"\`git-rev-parse --verify refs/remotes/thunk@2\`\" \
= \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
test \"\`git-cat-file blob refs/remotes/thunk:readme |\
- sed -n -e '3p'\`\" = goodbye
+ sed -n -e '3p'\`\" = goodbye &&
+ test -n \"\`git-config --get svn-remote.git-svn.fetch \
+ '^trunk:refs/remotes/thunk@2$'\`\"
"
test_expect_success 'init and fetch from one svn-remote' "