fetch: allow explicit --refmap to override configuration

diff --git a/t/t9141-git-svn-multiple-branches.sh b/t/t9141-git-svn-multiple-branches.sh
index cb9a6d229d24a4f4af062642d07660c5701429f6..8e7f7d68b7349cdbb11ee9337444c066ae590f99 100755 (executable)
--- a/t/t9141-git-svn-multiple-branches.sh
+++ b/t/t9141-git-svn-multiple-branches.sh
@@ -66,18 +66,18 @@ test_expect_success 'clone multiple branch and tag paths' '
                      -t tags_A/* --tags tags_B \
                      "$svnrepo/project" git_project &&
        ( cd git_project &&
-               git rev-parse refs/remotes/first &&
-               git rev-parse refs/remotes/second &&
-               git rev-parse refs/remotes/1 &&
-               git rev-parse refs/remotes/2 &&
-               git rev-parse refs/remotes/tags/1.0 &&
-               git rev-parse refs/remotes/tags/2.0 &&
-               git rev-parse refs/remotes/tags/3.0 &&
-               git rev-parse refs/remotes/tags/4.0 &&
-               git rev-parse refs/remotes/tags/v5 &&
-               git rev-parse refs/remotes/tags/v6 &&
-               git rev-parse refs/remotes/tags/v7 &&
-               git rev-parse refs/remotes/tags/v8
+               git rev-parse refs/remotes/origin/first &&
+               git rev-parse refs/remotes/origin/second &&
+               git rev-parse refs/remotes/origin/1 &&
+               git rev-parse refs/remotes/origin/2 &&
+               git rev-parse refs/remotes/origin/tags/1.0 &&
+               git rev-parse refs/remotes/origin/tags/2.0 &&
+               git rev-parse refs/remotes/origin/tags/3.0 &&
+               git rev-parse refs/remotes/origin/tags/4.0 &&
+               git rev-parse refs/remotes/origin/tags/v5 &&
+               git rev-parse refs/remotes/origin/tags/v6 &&
+               git rev-parse refs/remotes/origin/tags/v7 &&
+               git rev-parse refs/remotes/origin/tags/v8
        )
 '
 
@@ -85,8 +85,8 @@ test_expect_success 'Multiple branch or tag paths require -d' '
        ( cd git_project &&
                test_must_fail git svn branch -m "No new branch" Nope &&
                test_must_fail git svn tag -m "No new tag" Tagless &&
-               test_must_fail git rev-parse refs/remotes/Nope &&
-               test_must_fail git rev-parse refs/remotes/tags/Tagless
+               test_must_fail git rev-parse refs/remotes/origin/Nope &&
+               test_must_fail git rev-parse refs/remotes/origin/tags/Tagless
        ) &&
        ( cd svn_project &&
                svn_cmd up &&
@@ -99,22 +99,22 @@ test_expect_success 'Multiple branch or tag paths require -d' '
 
 test_expect_success 'create new branches and tags' '
        ( cd git_project &&
-               git svn branch -m "New branch 1" -d project/b_one New1 ) &&
+               git svn branch -m "New branch 1" -d b_one New1 ) &&
        ( cd svn_project &&
                svn_cmd up && test -e b_one/New1/a.file ) &&
 
        ( cd git_project &&
-               git svn branch -m "New branch 2" -d project/b_two New2 ) &&
+               git svn branch -m "New branch 2" -d b_two New2 ) &&
        ( cd svn_project &&
                svn_cmd up && test -e b_two/New2/a.file ) &&
 
        ( cd git_project &&
-               git svn branch -t -m "New tag 1" -d project/tags_A Tag1 ) &&
+               git svn branch -t -m "New tag 1" -d tags_A Tag1 ) &&
        ( cd svn_project &&
                svn_cmd up && test -e tags_A/Tag1/a.file ) &&
 
        ( cd git_project &&
-               git svn tag -m "New tag 2" -d project/tags_B Tag2 ) &&
+               git svn tag -m "New tag 2" -d tags_B Tag2 ) &&
        ( cd svn_project &&
                svn_cmd up && test -e tags_B/Tag2/a.file )
 '