summaryrefslogtreecommitdiff
path: root/t/t9104-git-svn-follow-parent.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-22 19:44:57 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-02-23 08:57:09 (GMT)
commit8b8fc06824cde2b314807e5e3a20e0adfd948cda (patch)
tree79558e7bd70ad025dc5e0836ad5d4abcd4cf255e /t/t9104-git-svn-follow-parent.sh
parent15710b6f34da26d30079dbc83c797a8335040b75 (diff)
downloadgit-8b8fc06824cde2b314807e5e3a20e0adfd948cda.zip
git-8b8fc06824cde2b314807e5e3a20e0adfd948cda.tar.gz
git-8b8fc06824cde2b314807e5e3a20e0adfd948cda.tar.bz2
git-svn: --follow-parent works with svn-remotes multiple branches
Bugs fixed: * We didn't allow manually (not using git-svn) init-ed remotes/fetch refspecs to be used before. It works now because that's what I did in this test. git-svn init should offer more control in the future. * correctly strip paths in the delta editor when using do_switch(). * Make the -i / GIT_SVN_ID option work correctly when doing fetch on a multi-ref svn-remote 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.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 91fdfe9..3afec97 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -36,6 +36,19 @@ test_expect_success 'init and fetch --follow-parent a moved directory' "
sed -n -e '3p'\`\" = goodbye
"
+test_expect_success 'init and fetch from one svn-remote' "
+ git-repo-config svn-remote.git-svn.url $svnrepo &&
+ git-repo-config --add svn-remote.git-svn.fetch \
+ trunk:refs/remotes/svn/trunk &&
+ git-repo-config --add svn-remote.git-svn.fetch \
+ thunk:refs/remotes/svn/thunk &&
+ git-svn fetch --follow-parent -i svn/thunk &&
+ test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
+ = \"\`git-rev-parse --verify refs/remotes/svn/thunk~1\`\" &&
+ test \"\`git-cat-file blob refs/remotes/svn/thunk:readme |\
+ sed -n -e '3p'\`\" = goodbye
+ "
+
test_debug 'gitk --all &'
test_done