diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2009-08-09 17:35:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-09 10:37:24 -0700 |
| commit | b6b0737d02e3bb9b3015ec66f5b6454d5b83d57b (patch) | |
| tree | d578601d2ab1d5ebeca65412c65522454aba8270 | |
| parent | git-checkout: be careful about untracked symlinks (diff) | |
| download | git-b6b0737d02e3bb9b3015ec66f5b6454d5b83d57b.tar.gz git-b6b0737d02e3bb9b3015ec66f5b6454d5b83d57b.zip | |
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>
| -rwxr-xr-x | t/t6035-merge-dir-to-symlink.sh | 6 |
1 files changed, 6 insertions, 0 deletions
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 && |