From 75de7fcca12a911449c966c1dfb7dfc47a23cbaa Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Wed, 19 Mar 2008 12:57:59 +0100 Subject: [PATCH] t1004: Exclude tests that involve symbolic links. Signed-off-by: Johannes Sixt --- t/t1004-read-tree-m-u-wf.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index 570d3729bd..bc6dc95e9c 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -157,6 +157,7 @@ test_expect_success '3-way not overwriting local changes (their side)' ' ' +test "$no_symlinks" || { test_expect_success 'funny symlink in work tree' ' git reset --hard && @@ -191,6 +192,7 @@ test_expect_success 'funny symlink in work tree, un-unlink-able' ' # clean-up from the above test chmod a+w a rm -fr a b +} # $no_symlinks test_expect_success 'D/F setup' '