From: Pat Thoyts Date: Thu, 03 Feb 2011 15:31:42 GMT Subject: [PATCH 1/4] t3509: use unconstrained initial test to setup repository. Message-ID: <1296747105-1663-2-git-send-email-patthoyts@users.sourceforge.net> In-Reply-To: <1296747105-1663-1-git-send-email-patthoyts@users.sourceforge.net> The first test did not run on msysGit due to the SYMLINKS constraint and so subsequent tests failed because the test repository was not initialized. Signed-off-by: Pat Thoyts --- t/t3509-cherry-pick-merge-df.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh index 948ca1b..df921d1 100755 --- a/t/t3509-cherry-pick-merge-df.sh +++ b/t/t3509-cherry-pick-merge-df.sh @@ -3,12 +3,14 @@ test_description='Test cherry-pick with directory/file conflicts' . ./test-lib.sh -test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' ' +test_expect_success 'Initialize repository' ' mkdir a && >a/f && git add a && - git commit -m a && + git commit -m a +' +test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' ' mkdir b && ln -s ../a b/a && git add b && -- 1.7.4.msysgit.0