Skip to content

Commit

Permalink
t3509: use unconstrained initial test to setup repository.
Browse files Browse the repository at this point in the history
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 <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Pat Thoyts authored and Junio C Hamano committed Feb 7, 2011
1 parent 13af8cb commit 899663f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions t/t3509-cherry-pick-merge-df.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 899663f

Please sign in to comment.