From b6b0737d02e3bb9b3015ec66f5b6454d5b83d57b Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sun, 9 Aug 2009 17:35:02 +0200 Subject: [PATCH] t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- t/t6035-merge-dir-to-symlink.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh index a0ddf1e0f4..5b96fb0b37 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -3,6 +3,12 @@ test_description='merging when a directory was replaced with a symlink' . ./test-lib.sh +if ! test_have_prereq SYMLINKS +then + say 'Symbolic links not supported, skipping tests.' + test_done +fi + test_expect_success 'create a commit where dir a/b changed to symlink' ' mkdir -p a/b/c a/b-2/c && > a/b/c/d &&