Skip to content

Commit

Permalink
t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
Browse files Browse the repository at this point in the history
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Sixt authored and Junio C Hamano committed Aug 9, 2009
1 parent b6986d8 commit b6b0737
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions t/t6035-merge-dir-to-symlink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit b6b0737

Please sign in to comment.