Skip to content

Commit b6b0737

Browse files
j6tgitster
authored andcommitted
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>
1 parent b6986d8 commit b6b0737

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

t/t6035-merge-dir-to-symlink.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
test_description='merging when a directory was replaced with a symlink'
44
. ./test-lib.sh
55

6+
if ! test_have_prereq SYMLINKS
7+
then
8+
say 'Symbolic links not supported, skipping tests.'
9+
test_done
10+
fi
11+
612
test_expect_success 'create a commit where dir a/b changed to symlink' '
713
mkdir -p a/b/c a/b-2/c &&
814
> a/b/c/d &&

0 commit comments

Comments
 (0)