Subject: [PATCH 2/3] git-svn-test: don't test for possible bug "Failed to strip path", try #2

From: Ilya Basin <[email-masked]>
Date: Mon, 29 Apr 2013 00:10:53 +0400

In the previous commit a showcase was added to
t9160-git-svn-preserve-empty-dirs.sh for the "Failed to strip path" bug.
Now the flag --stdlayout should be enough.
---
 t/t9160-git-svn-preserve-empty-dirs.sh | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index 1b5a286..43b1852 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -51,21 +51,13 @@ test_expect_success 'initialize source svn repo containing empty dirs' '
 		echo "Conflict file" > 5/.placeholder &&
 		mkdir 6/.placeholder &&
 		svn_cmd add 5/.placeholder 6/.placeholder &&
-		svn_cmd commit -m "Placeholder Namespace conflict" &&
-
-		echo x > fil.txt &&
-		svn_cmd add fil.txt &&
-		svn_cmd commit -m "this commit should not kill git-svn"
+		svn_cmd commit -m "Placeholder Namespace conflict"
 	) &&
 	rm -rf "$SVN_TREE"
 '
 
 test_expect_success 'clone svn repo with --preserve-empty-dirs --stdlayout' '
-	git svn clone "$svnrepo" --preserve-empty-dirs --stdlayout "$GIT_REPO" || (
-		cd "$GIT_REPO"
-		git svn fetch # fetch the rest can succeed even if clone failed
-		false # this test still failed
-	)
+	git svn clone "$svnrepo" --preserve-empty-dirs --stdlayout "$GIT_REPO"
 '
 
 # "$GIT_REPO"/1 should only contain the placeholder file.
@@ -89,11 +81,11 @@ test_expect_success 'add entry to previously empty directory' '
 	test -f "$GIT_REPO"/4/a/b/c/foo
 '
 
-# The HEAD~3 commit should not have introduced .gitignore placeholder files.
+# The HEAD~2 commit should not have introduced .gitignore placeholder files.
 test_expect_success 'remove non-last entry from directory' '
 	(
 		cd "$GIT_REPO" &&
-		git checkout HEAD~3
+		git checkout HEAD~2
 	) &&
 	test_must_fail test -f "$GIT_REPO"/2/.gitignore &&
 	test_must_fail test -f "$GIT_REPO"/3/.gitignore
-- 
1.8.1.5