projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b6986d8
)
t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
author
Johannes Sixt
<j6t@kdbg.org>
Sun, 9 Aug 2009 15:35:02 +0000
(17:35 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 9 Aug 2009 17:37:24 +0000
(10:37 -0700)
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6035-merge-dir-to-symlink.sh
patch
|
blob
|
history
diff --git
a/t/t6035-merge-dir-to-symlink.sh
b/t/t6035-merge-dir-to-symlink.sh
index a0ddf1e0f4013d1adba97561b5b692da7010383f..5b96fb0b37b8397342796fd3b9fec94c91063ba4 100755
(executable)
--- 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 &&