Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t9128-git-svn-cmd-branch.sh b/t/t9128-git-svn-cmd-branch.sh
index 252daa7e1aec3c40a31db9a12a9432fbb85ef1b0..4e95f791db1ff2be9781cf965d5a12a86c5a8ce3 100755 (executable)
--- a/t/t9128-git-svn-cmd-branch.sh
+++ b/t/t9128-git-svn-cmd-branch.sh
@@ -9,19 +9,19 @@ test_description='git svn partial-rebuild tests'
 test_expect_success 'initialize svnrepo' '
        mkdir import &&
        (
-               cd import &&
+               (cd import &&
                mkdir trunk branches tags &&
-               cd trunk &&
-               echo foo > foo &&
-               cd .. &&
-               svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
-               cd .. &&
+               (cd trunk &&
+               echo foo > foo
+               ) &&
+               svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null
+               ) &&
                rm -rf import &&
-               svn co "$svnrepo"/trunk trunk &&
-               cd trunk &&
+               svn_cmd co "$svnrepo"/trunk trunk &&
+               (cd trunk &&
                echo bar >> foo &&
-               svn ci -m "updated trunk" &&
-               cd .. &&
+               svn_cmd ci -m "updated trunk"
+               ) &&
                rm -rf trunk
        )
 '
@@ -29,42 +29,42 @@ test_expect_success 'initialize svnrepo' '
 test_expect_success 'import into git' '
        git svn init --stdlayout "$svnrepo" &&
        git svn fetch &&
-       git checkout remotes/trunk
+       git checkout remotes/origin/trunk
 '
 
 test_expect_success 'git svn branch tests' '
        git svn branch a &&
        base=$(git rev-parse HEAD:) &&
-       test $base = $(git rev-parse remotes/a:) &&
+       test $base = $(git rev-parse remotes/origin/a:) &&
        git svn branch -m "created branch b blah" b &&
-       test $base = $(git rev-parse remotes/b:) &&
+       test $base = $(git rev-parse remotes/origin/b:) &&
        test_must_fail git branch -m "no branchname" &&
        git svn branch -n c &&
-       test_must_fail git rev-parse remotes/c &&
+       test_must_fail git rev-parse remotes/origin/c &&
        test_must_fail git svn branch a &&
        git svn branch -t tag1 &&
-       test $base = $(git rev-parse remotes/tags/tag1:) &&
+       test $base = $(git rev-parse remotes/origin/tags/tag1:) &&
        git svn branch --tag tag2 &&
-       test $base = $(git rev-parse remotes/tags/tag2:) &&
+       test $base = $(git rev-parse remotes/origin/tags/tag2:) &&
        git svn tag tag3 &&
-       test $base = $(git rev-parse remotes/tags/tag3:) &&
+       test $base = $(git rev-parse remotes/origin/tags/tag3:) &&
        git svn tag -m "created tag4 foo" tag4 &&
-       test $base = $(git rev-parse remotes/tags/tag4:) &&
+       test $base = $(git rev-parse remotes/origin/tags/tag4:) &&
        test_must_fail git svn tag -m "no tagname" &&
        git svn tag -n tag5 &&
-       test_must_fail git rev-parse remotes/tags/tag5 &&
+       test_must_fail git rev-parse remotes/origin/tags/tag5 &&
        test_must_fail git svn tag tag1
 '
 
 test_expect_success 'branch uses correct svn-remote' '
-       (svn co "$svnrepo" svn &&
+       (svn_cmd co "$svnrepo" svn &&
        cd svn &&
        mkdir mirror &&
-       svn add mirror &&
-       svn copy trunk mirror/ &&
-       svn copy tags mirror/ &&
-       svn copy branches mirror/ &&
-       svn ci -m "made mirror" ) &&
+       svn_cmd add mirror &&
+       svn_cmd copy trunk mirror/ &&
+       svn_cmd copy tags mirror/ &&
+       svn_cmd copy branches mirror/ &&
+       svn_cmd ci -m "made mirror" ) &&
        rm -rf svn &&
        git svn init -s -R mirror --prefix=mirror/ "$svnrepo"/mirror &&
        git svn fetch -R mirror &&