X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft9107-git-svn-migrate.sh;h=0a41d52c7a734c530cd93e8f536aa9a0a8b5a3f6;hb=a41acc63badf20cbb22cca61039dca9309deaa19;hp=d549665400a2eccffec0689865a1e9fdcc034985;hpb=610f043bb378d12f399f4e5692fb874e0a043b23;p=git.git

diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index d54966540..0a41d52c7 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,8 +33,8 @@ 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/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'
@@ -42,20 +42,20 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
 
 test_expect_success 'initialize a multi-repository repo' "
 	git-svn init $svnrepo -T trunk -t tags -b branches &&
-	git-config --get-all svn-remote.svn.fetch > fetch.out &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
 	grep '^trunk:refs/remotes/trunk$' fetch.out &&
-	test -n \"\`git-config --get svn-remote.svn.branches \
+	test -n \"\`git config --get svn-remote.svn.branches \
 	            '^branches/\*:refs/remotes/\*$'\`\" &&
-	test -n \"\`git-config --get svn-remote.svn.tags \
+	test -n \"\`git config --get svn-remote.svn.tags \
 	            '^tags/\*:refs/remotes/tags/\*$'\`\" &&
 	git config --unset svn-remote.svn.branches \
 	                        '^branches/\*:refs/remotes/\*$' &&
 	git config --unset svn-remote.svn.tags \
 	                        '^tags/\*:refs/remotes/tags/\*$' &&
-	git-config --add svn-remote.svn.fetch 'branches/a:refs/remotes/a' &&
-	git-config --add svn-remote.svn.fetch 'branches/b:refs/remotes/b' &&
+	git config --add svn-remote.svn.fetch 'branches/a:refs/remotes/a' &&
+	git config --add svn-remote.svn.fetch 'branches/b:refs/remotes/b' &&
 	for i in tags/0.1 tags/0.2 tags/0.3; do
-		git-config --add svn-remote.svn.fetch \
+		git config --add svn-remote.svn.fetch \
 		                 \$i:refs/remotes/\$i || exit 1; done
 	"
 
@@ -86,8 +86,8 @@ test_expect_success 'migrate --minimize on old inited layout' "
 		echo $svnrepo\$path > $GIT_DIR/svn/\$ref/info/url ) || exit 1;
 	done &&
 	git-svn migrate --minimize &&
-	test -z \"\`git-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
-	git-config --get-all svn-remote.svn.fetch > fetch.out &&
+	test -z \"\`git config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
 	grep '^trunk:refs/remotes/trunk$' fetch.out &&
 	grep '^branches/a:refs/remotes/a$' fetch.out &&
 	grep '^branches/b:refs/remotes/b$' fetch.out &&
@@ -97,15 +97,19 @@ test_expect_success 'migrate --minimize on old inited layout' "
 	grep '^:refs/remotes/git-svn' fetch.out
 	"
 
-test_expect_success  ".rev_db auto-converted to .rev_db.UUID" "
+test_expect_success  ".rev_db auto-converted to .rev_map.UUID" "
 	git-svn fetch -i trunk &&
-	expect=$GIT_DIR/svn/trunk/.rev_db.* &&
+	test -z \"\$(ls $GIT_DIR/svn/trunk/.rev_db.* 2>/dev/null)\" &&
+	expect=\"\$(ls $GIT_DIR/svn/trunk/.rev_map.*)\" &&
 	test -n \"\$expect\" &&
-	mv \$expect $GIT_DIR/svn/trunk/.rev_db &&
+	rev_db=\$(echo \$expect | sed -e 's,_map,_db,') &&
+	convert_to_rev_db \$expect \$rev_db &&
+	rm -f \$expect &&
+	test -f \$rev_db &&
 	git-svn fetch -i trunk &&
-	test -L $GIT_DIR/svn/trunk/.rev_db &&
-	test -f \$expect &&
-	cmp \$expect $GIT_DIR/svn/trunk/.rev_db
+	test -z \"\$(ls $GIT_DIR/svn/trunk/.rev_db.* 2>/dev/null)\" &&
+	test ! -e $GIT_DIR/svn/trunk/.rev_db &&
+	test -f \$expect
 	"
 
 test_done