{"thread":{"id":"33666","subject":"[PATCH 2/3] git-svn-test: don't test for possible bug \"Failed to strip path\", try #2","startedAt":"2013-04-28T20:10:53Z","lastAt":"2013-04-28T20:10:53Z","messageCount":1,"participants":["Ilya Basin"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"215808","messageId":"488064812.20130429001053@gmail.com","threadId":"33666","inReplyTo":null,"subject":"[PATCH 2/3] git-svn-test: don't test for possible bug \"Failed to strip path\", try #2","fromName":"Ilya Basin","fromEmail":"basinilya@gmail.com","sentAt":"2013-04-28T20:10:53Z","receivedAt":"2013-04-28T20:10:53Z","isPatch":true,"sender":{"key":"basinilya@gmail.com","avatar":null},"body":"In the previous commit a showcase was added to\nt9160-git-svn-preserve-empty-dirs.sh for the \"Failed to strip path\" bug.\nNow the flag --stdlayout should be enough.\n---\n t/t9160-git-svn-preserve-empty-dirs.sh | 16 ++++------------\n 1 file changed, 4 insertions(+), 12 deletions(-)\n\ndiff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh\nindex 1b5a286..43b1852 100755\n--- a/t/t9160-git-svn-preserve-empty-dirs.sh\n+++ b/t/t9160-git-svn-preserve-empty-dirs.sh\n@@ -51,21 +51,13 @@ test_expect_success 'initialize source svn repo containing empty dirs' '\n \t\techo \"Conflict file\" > 5/.placeholder &&\n \t\tmkdir 6/.placeholder &&\n \t\tsvn_cmd add 5/.placeholder 6/.placeholder &&\n-\t\tsvn_cmd commit -m \"Placeholder Namespace conflict\" &&\n-\n-\t\techo x > fil.txt &&\n-\t\tsvn_cmd add fil.txt &&\n-\t\tsvn_cmd commit -m \"this commit should not kill git-svn\"\n+\t\tsvn_cmd commit -m \"Placeholder Namespace conflict\"\n \t) &&\n \trm -rf \"$SVN_TREE\"\n '\n \n test_expect_success 'clone svn repo with --preserve-empty-dirs --stdlayout' '\n-\tgit svn clone \"$svnrepo\" --preserve-empty-dirs --stdlayout \"$GIT_REPO\" || (\n-\t\tcd \"$GIT_REPO\"\n-\t\tgit svn fetch # fetch the rest can succeed even if clone failed\n-\t\tfalse # this test still failed\n-\t)\n+\tgit svn clone \"$svnrepo\" --preserve-empty-dirs --stdlayout \"$GIT_REPO\"\n '\n \n # \"$GIT_REPO\"/1 should only contain the placeholder file.\n@@ -89,11 +81,11 @@ test_expect_success 'add entry to previously empty directory' '\n \ttest -f \"$GIT_REPO\"/4/a/b/c/foo\n '\n \n-# The HEAD~3 commit should not have introduced .gitignore placeholder files.\n+# The HEAD~2 commit should not have introduced .gitignore placeholder files.\n test_expect_success 'remove non-last entry from directory' '\n \t(\n \t\tcd \"$GIT_REPO\" &&\n-\t\tgit checkout HEAD~3\n+\t\tgit checkout HEAD~2\n \t) &&\n \ttest_must_fail test -f \"$GIT_REPO\"/2/.gitignore &&\n \ttest_must_fail test -f \"$GIT_REPO\"/3/.gitignore\n-- \n1.8.1.5\n"}]}