Browse Source

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>
maint
Johannes Sixt 16 years ago committed by Junio C Hamano
parent
commit
b6b0737d02
  1. 6
      t/t6035-merge-dir-to-symlink.sh

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

@ -3,6 +3,12 @@ @@ -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 &&

Loading…
Cancel
Save