t3509: use unconstrained initial test to setup repository.
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>
Pat Thoyts committed
Feb 3, 2011 at 15:31 UTC
899663f8e452caf158d98d558a41f9b04042b18f
1 file changed
+4
-2
t/t3509-cherry-pick-merge-df.sh
+4
-2
@@ -3,12 +3,14 @@
3
test_description='Test cherry-pick with directory/file conflicts'
4
. ./test-lib.sh
5
6
-test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
6
+test_expect_success 'Initialize repository' '
7
mkdir a &&
8
>a/f &&
9
git add a &&
10
- git commit -m a &&
10
+ git commit -m a
11
+'
12
13
+test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
14
mkdir b &&
15
ln -s ../a b/a &&
16
git add b &&