From: Johannes Sixt <j6t@kdbg.org>
Date: Sun, 9 Aug 2009 15:35:02 +0000 (+0200)
Subject: t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
X-Git-Tag: v1.6.4.2~12^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6b0737d02e3bb9b3015ec66f5b6454d5b83d57b;p=git.git

t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index a0ddf1e0f..5b96fb0b3 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 &&