summaryrefslogtreecommitdiff
path: root/t/t9107-git-svn-migrate.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t9107-git-svn-migrate.sh')
-rwxr-xr-xt/t9107-git-svn-migrate.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index d9b553ad55..f3c75fc141 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -19,9 +19,9 @@ test_expect_success 'setup old-looking metadata' '
mv "$GIT_DIR"/svn/* "$GIT_DIR"/ &&
mv "$GIT_DIR"/svn/.metadata "$GIT_DIR"/ &&
rmdir "$GIT_DIR"/svn &&
- git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
- git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
- git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
+ git update-ref refs/heads/git-svn-HEAD refs/${remotes_git_svn} &&
+ git update-ref refs/heads/svn-HEAD refs/${remotes_git_svn} &&
+ git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
'
head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
@@ -33,11 +33,11 @@ test_expect_success 'initialize old-style (v0) git-svn layout' '
echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
git-svn migrate &&
! test -d "$GIT_DIR"/git-svn &&
- git rev-parse --verify refs/remotes/git-svn^0 &&
+ git rev-parse --verify refs/${remotes_git_svn}^0 &&
git rev-parse --verify refs/remotes/svn^0 &&
test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
test `git config --get svn-remote.svn.fetch` = \
- ":refs/remotes/git-svn"
+ ":refs/${remotes_git_svn}"
'
test_expect_success 'initialize a multi-repository repo' '
@@ -94,7 +94,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
grep "^tags/0\.1:refs/remotes/tags/0\.1$" fetch.out &&
grep "^tags/0\.2:refs/remotes/tags/0\.2$" fetch.out &&
grep "^tags/0\.3:refs/remotes/tags/0\.3$" fetch.out
- grep "^:refs/remotes/git-svn" fetch.out
+ grep "^:refs/${remotes_git_svn}" fetch.out
'
test_expect_success ".rev_db auto-converted to .rev_map.UUID" '