X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft9100-git-svn-basic.sh;h=7dcfc7e7db47a815606577b366f309f590896082;hb=9e64d109f905afb225f48409c4e0e068b2203332;hp=c22fe47213a8fccbb954aef4b175d2ea1a920e16;hpb=39ed7c181b7a8f5e28cffcaca9369e6ebc74a055;p=git.git

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index c22fe4721..7dcfc7e7d 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -24,10 +24,7 @@ test_expect_success \
 	mkdir import &&
 	cd import &&
 	echo foo > foo &&
-	if test -z '$NO_SYMLINK'
-	then
-		ln -s foo foo.link
-	fi
+	ln -s foo foo.link
 	mkdir -p dir/a/b/c/d/e &&
 	echo 'deep dir' > dir/a/b/c/d/e/file &&
 	mkdir bar &&
@@ -136,48 +133,43 @@ test_expect_success "$name" "
 	test -x '$SVN_TREE'/exec.sh"
 
 
-if test -z "$NO_SYMLINK"
-then
-	name='executable file becomes a symlink to bar/zzz (file)'
-
-	test_expect_success "$name" "
-		rm exec.sh &&
-		ln -s bar/zzz exec.sh &&
-		git update-index exec.sh &&
-		git commit -m '$name' &&
-		git-svn set-tree --find-copies-harder --rmdir \
-			remotes/git-svn..mybranch5 &&
-		svn up '$SVN_TREE' &&
-		test -L '$SVN_TREE'/exec.sh"
+name='executable file becomes a symlink to bar/zzz (file)'
+test_expect_success "$name" "
+	rm exec.sh &&
+	ln -s bar/zzz exec.sh &&
+	git update-index exec.sh &&
+	git commit -m '$name' &&
+	git-svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn up '$SVN_TREE' &&
+	test -L '$SVN_TREE'/exec.sh"
 
-	name='new symlink is added to a file that was also just made executable'
+name='new symlink is added to a file that was also just made executable'
 
-	test_expect_success "$name" "
-		chmod +x bar/zzz &&
-		ln -s bar/zzz exec-2.sh &&
-		git update-index --add bar/zzz exec-2.sh &&
-		git commit -m '$name' &&
-		git-svn set-tree --find-copies-harder --rmdir \
-			remotes/git-svn..mybranch5 &&
-		svn up '$SVN_TREE' &&
-		test -x '$SVN_TREE'/bar/zzz &&
-		test -L '$SVN_TREE'/exec-2.sh"
-
-	name='modify a symlink to become a file'
-	test_expect_success "$name" "
-		echo git help > help || true &&
-		rm exec-2.sh &&
-		cp help exec-2.sh &&
-		git update-index exec-2.sh &&
-		git commit -m '$name' &&
-		git-svn set-tree --find-copies-harder --rmdir \
-			remotes/git-svn..mybranch5 &&
-		svn up '$SVN_TREE' &&
-		test -f '$SVN_TREE'/exec-2.sh &&
-		test ! -L '$SVN_TREE'/exec-2.sh &&
-		diff -u help $SVN_TREE/exec-2.sh"
-fi
+test_expect_success "$name" "
+	chmod +x bar/zzz &&
+	ln -s bar/zzz exec-2.sh &&
+	git update-index --add bar/zzz exec-2.sh &&
+	git commit -m '$name' &&
+	git-svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn up '$SVN_TREE' &&
+	test -x '$SVN_TREE'/bar/zzz &&
+	test -L '$SVN_TREE'/exec-2.sh"
 
+name='modify a symlink to become a file'
+test_expect_success "$name" "
+	echo git help > help || true &&
+	rm exec-2.sh &&
+	cp help exec-2.sh &&
+	git update-index exec-2.sh &&
+	git commit -m '$name' &&
+	git-svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn up '$SVN_TREE' &&
+	test -f '$SVN_TREE'/exec-2.sh &&
+	test ! -L '$SVN_TREE'/exec-2.sh &&
+	diff -u help $SVN_TREE/exec-2.sh"
 
 if test "$have_utf8" = t
 then
@@ -203,12 +195,6 @@ test_expect_success "$name" \
      git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
      diff -u a b"
 
-if test -n "$NO_SYMLINK"
-then
-	test_done
-	exit 0
-fi
-
 name='check imported tree checksums expected tree checksums'
 rm -f expected
 if test "$have_utf8" = t
@@ -225,8 +211,58 @@ tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
 tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
 EOF
 
-echo tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904 >> expected
-
 test_expect_success "$name" "diff -u a expected"
 
+test_expect_failure 'exit if remote refs are ambigious' "
+        git-config --add svn-remote.svn.fetch \
+                              bar:refs/remotes/git-svn &&
+        git-svn migrate
+        "
+
+test_expect_failure 'exit if init-ing a would clobber a URL' "
+        svnadmin create ${PWD}/svnrepo2 &&
+        svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&
+        git-config --unset svn-remote.svn.fetch \
+                                '^bar:refs/remotes/git-svn$' &&
+        git-svn init ${svnrepo}2/bar
+        "
+
+test_expect_success \
+  'init allows us to connect to another directory in the same repo' "
+        git-svn init -i bar $svnrepo/bar &&
+        git config --get svn-remote.svn.fetch \
+                              '^bar:refs/remotes/bar$' &&
+        git config --get svn-remote.svn.fetch \
+                              '^:refs/remotes/git-svn$'
+        "
+
+test_expect_success 'able to dcommit to a subdirectory' "
+	git-svn fetch -i bar &&
+	git checkout -b my-bar refs/remotes/bar &&
+	echo abc > d &&
+	git update-index --add d &&
+	git commit -m '/bar/d should be in the log' &&
+	git-svn dcommit -i bar &&
+	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
+	mkdir newdir &&
+	echo new > newdir/dir &&
+	git update-index --add newdir/dir &&
+	git commit -m 'add a new directory' &&
+	git-svn dcommit -i bar &&
+	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
+	echo foo >> newdir/dir &&
+	git update-index newdir/dir &&
+	git commit -m 'modify a file in new directory' &&
+	git-svn dcommit -i bar &&
+	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
+	"
+
+test_expect_success 'able to set-tree to a subdirectory' "
+	echo cba > d &&
+	git update-index d &&
+	git commit -m 'update /bar/d' &&
+	git-svn set-tree -i bar HEAD &&
+	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
+	"
+
 test_done