Merge branch 'maint'

diff --git a/t/t9103-git-svn-graft-branches.sh b/t/t9103-git-svn-graft-branches.sh
index cc62d4ece888a3be5c237a00c35699ab152cbdf5..183ae3b1c2f0511810c18418c109a2e1412fa8a8 100755 (executable)
--- a/t/t9103-git-svn-graft-branches.sh
+++ b/t/t9103-git-svn-graft-branches.sh
@@ -1,6 +1,9 @@
+#!/bin/sh
 test_description='git-svn graft-branches'
 . ./lib-git-svn.sh
 
+svnrepo="$svnrepo/test-git-svn"
+
 test_expect_success 'initialize repo' "
        mkdir import &&
        cd import &&
@@ -13,26 +16,21 @@ test_expect_success 'initialize repo' "
        svn co $svnrepo wc &&
        cd wc &&
        echo feedme >> branches/a/readme &&
+       poke branches/a/readme &&
        svn commit -m hungry &&
-       svn up &&
        cd trunk &&
        svn merge -r3:4 $svnrepo/branches/a &&
        svn commit -m 'merge with a' &&
        cd ../.. &&
-       svn log -v $svnrepo &&
-       git-svn init -i trunk $svnrepo/trunk &&
-       git-svn init -i a $svnrepo/branches/a &&
-       git-svn init -i tags/a $svnrepo/tags/a &&
-       git-svn fetch -i tags/a &&
-       git-svn fetch -i a &&
-       git-svn fetch -i trunk
+       git-svn multi-init $svnrepo -T trunk -b branches -t tags &&
+       git-svn multi-fetch
        "
 
 r1=`git-rev-list remotes/trunk | tail -n1`
 r2=`git-rev-list remotes/tags/a | tail -n1`
 r3=`git-rev-list remotes/a | tail -n1`
-r4=`git-rev-list remotes/a | head -n1`
-r5=`git-rev-list remotes/trunk | head -n1`
+r4=`git-rev-parse remotes/a`
+r5=`git-rev-parse remotes/trunk`
 
 test_expect_success 'test graft-branches regexes and copies' "
        test -n "$r1" &&